Skip to content

Commit f35d6a2

Browse files
dottedmagdottedmag
committed
Use logging_old.h for CfOut
1 parent fd9a468 commit f35d6a2

File tree

104 files changed

+105
-95
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+105
-95
lines changed

‎cf-agent/acl_posix.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "acl_posix.h"
2929
#include "promises.h"
3030
#include "files_names.h"
31-
#include "logging.h"
31+
#include "logging_old.h"
3232
#include "misc_lib.h"
3333
#include "rlist.h"
3434
#include "env_context.h"

‎cf-agent/cf-agent-enterprise-stubs.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424

2525
#include "cf-agent-enterprise-stubs.h"
26-
#include "logging.h"
26+
#include "logging_old.h"
2727

2828
void VerifyWindowsService(EvalContext *ctx, Attributes a, Promise *pp)
2929
{

‎cf-agent/cf-agent.c

+1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
#include "promises.h"
5757
#include "unix.h"
5858
#include "attributes.h"
59+
#include "logging_old.h"
5960
#include "logging.h"
6061
#include "communication.h"
6162
#include "signals.h"

‎cf-agent/cf_acl.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "acl_posix.h"
2828
#include "files_names.h"
2929
#include "promises.h"
30-
#include "logging.h"
30+
#include "logging_old.h"
3131
#include "string_lib.h"
3232
#include "rlist.h"
3333
#include "env_context.h"

‎cf-agent/cf_sql.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
#include "cf_sql.h"
2727

28-
#include "logging.h"
28+
#include "logging_old.h"
2929

3030
#ifdef HAVE_MYSQL_H
3131
# include <mysql.h>

‎cf-agent/files_edit.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include "files_lib.h"
3333
#include "files_editxml.h"
3434
#include "item_lib.h"
35-
#include "logging.h"
35+
#include "logging_old.h"
3636
#include "policy.h"
3737

3838
/*****************************************************************************/

‎cf-agent/files_editline.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include "scope.h"
3737
#include "matching.h"
3838
#include "attributes.h"
39-
#include "logging.h"
39+
#include "logging_old.h"
4040
#include "locks.h"
4141
#include "string_lib.h"
4242
#include "misc_lib.h"

‎cf-agent/files_editxml.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include "scope.h"
3838
#include "files_interfaces.h"
3939
#include "attributes.h"
40-
#include "logging.h"
40+
#include "logging_old.h"
4141
#include "locks.h"
4242
#include "policy.h"
4343
#include "ornaments.h"

‎cf-agent/files_links.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include "files_operators.h"
3232
#include "files_lib.h"
3333
#include "locks.h"
34-
#include "logging.h"
34+
#include "logging_old.h"
3535
#include "string_lib.h"
3636
#include "misc_lib.h"
3737
#include "env_context.h"

‎cf-agent/files_operators.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
#include "scope.h"
4242
#include "matching.h"
4343
#include "attributes.h"
44-
#include "logging.h"
44+
#include "logging_old.h"
4545
#include "client_code.h"
4646
#include "pipes.h"
4747
#include "locks.h"

‎cf-agent/files_properties.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "files_names.h"
2929
#include "files_interfaces.h"
3030
#include "item_lib.h"
31-
#include "logging.h"
31+
#include "logging_old.h"
3232

3333
/* lstat */
3434
#ifdef HAVE_NOVA

‎cf-agent/files_repository.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include "files_lib.h"
3131
#include "files_copy.h"
3232
#include "item_lib.h"
33-
#include "logging.h"
33+
#include "logging_old.h"
3434
#include "mutex.h"
3535
#include "policy.h"
3636

‎cf-agent/files_select.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include "files_interfaces.h"
3131
#include "promises.h"
3232
#include "matching.h"
33-
#include "logging.h"
33+
#include "logging_old.h"
3434
#include "string_lib.h"
3535
#include "pipes.h"
3636
#include "promises.h"

‎cf-agent/findhub.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "findhub.h"
22
#include "atexit.h"
33
#include "string_lib.h"
4-
#include "logging.h"
4+
#include "logging_old.h"
55
#include "misc_lib.h"
66

77
List *hublist = NULL;

‎cf-agent/nfs.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include "item_lib.h"
3333
#include "conversion.h"
3434
#include "matching.h"
35-
#include "logging.h"
35+
#include "logging_old.h"
3636
#include "string_lib.h"
3737
#include "pipes.h"
3838
#include "nfs.h"

‎cf-agent/promiser_regex_resolver.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#include "dir.h"
3939
#include "files_properties.h"
4040
#include "scope.h"
41-
#include "logging.h"
41+
#include "logging_old.h"
4242
#include "item_lib.h"
4343

4444
#ifdef HAVE_NOVA

‎cf-agent/retcode.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#include "retcode.h"
2626
#include "rlist.h"
27-
#include "logging.h"
27+
#include "logging_old.h"
2828

2929
int VerifyCommandRetcode(EvalContext *ctx, int retcode, int fallback, Attributes a, Promise *pp)
3030
{

‎cf-agent/vercmp.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
/* ExpandScalar */
3232
#include "expand.h"
3333
#include "vars.h"
34-
#include "logging.h"
34+
#include "logging_old.h"
3535
#include "pipes.h"
3636
#include "misc_lib.h"
3737
#include "env_context.h"

‎cf-agent/vercmp_internal.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
#include "files_names.h"
2828
#include "vercmp_internal.h"
29-
#include "logging.h"
29+
#include "logging_old.h"
3030
#include "rlist.h"
3131

3232
static void ParsePackageVersion(char *version, Rlist **num, Rlist **sep);

‎cf-agent/verify_databases.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "files_names.h"
3030
#include "conversion.h"
3131
#include "attributes.h"
32-
#include "logging.h"
32+
#include "logging_old.h"
3333
#include "string_lib.h"
3434
#include "locks.h"
3535
#include "cf_sql.h"

‎cf-agent/verify_environments.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include "vars.h"
3131
#include "conversion.h"
3232
#include "attributes.h"
33-
#include "logging.h"
33+
#include "logging_old.h"
3434
#include "locks.h"
3535
#include "policy.h"
3636
#include "scope.h"

‎cf-agent/verify_exec.c

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#include "conversion.h"
3333
#include "instrumentation.h"
3434
#include "attributes.h"
35+
#include "logging_old.h"
3536
#include "logging.h"
3637
#include "pipes.h"
3738
#include "locks.h"

‎cf-agent/verify_files.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
#include "item_lib.h"
4343
#include "matching.h"
4444
#include "attributes.h"
45-
#include "logging.h"
45+
#include "logging_old.h"
4646
#include "locks.h"
4747
#include "string_lib.h"
4848
#include "verify_files_utils.h"

‎cf-agent/verify_files_hashes.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525

2626
#include "verify_files_hashes.h"
27-
#include "logging.h"
27+
#include "logging_old.h"
2828
#include "rlist.h"
2929
#include "policy.h"
3030
#include "client_code.h"

‎cf-agent/verify_files_utils.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#include "verify_files_utils.h"
2626

27-
#include "logging.h"
27+
#include "logging_old.h"
2828
#include "dir.h"
2929
#include "files_names.h"
3030
#include "files_links.h"

‎cf-agent/verify_methods.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include "hashes.h"
3434
#include "unix.h"
3535
#include "attributes.h"
36-
#include "logging.h"
36+
#include "logging_old.h"
3737
#include "locks.h"
3838
#include "generic_agent.h" // HashVariables
3939
#include "fncall.h"

‎cf-agent/verify_packages.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include "vercmp.h"
3737
#include "matching.h"
3838
#include "attributes.h"
39-
#include "logging.h"
39+
#include "logging_old.h"
4040
#include "string_lib.h"
4141
#include "pipes.h"
4242
#include "locks.h"

‎cf-agent/verify_processes.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include "conversion.h"
3333
#include "matching.h"
3434
#include "attributes.h"
35-
#include "logging.h"
35+
#include "logging_old.h"
3636
#include "locks.h"
3737
#include "exec_tools.h"
3838
#include "rlist.h"

‎cf-agent/verify_services.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "promises.h"
2929
#include "vars.h"
3030
#include "attributes.h"
31-
#include "logging.h"
31+
#include "logging_old.h"
3232
#include "fncall.h"
3333
#include "locks.h"
3434
#include "rlist.h"

‎cf-agent/verify_storage.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include "files_links.h"
3434
#include "files_properties.h"
3535
#include "attributes.h"
36-
#include "logging.h"
36+
#include "logging_old.h"
3737
#include "locks.h"
3838
#include "nfs.h"
3939
#include "rlist.h"

‎cf-execd/cf-execd-runner.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#include "files_names.h"
2929
#include "files_interfaces.h"
30-
#include "logging.h"
30+
#include "logging_old.h"
3131
#include "hashes.h"
3232
#include "string_lib.h"
3333
#include "pipes.h"

‎cf-execd/cf-execd.c

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
#include "scope.h"
3737
#include "hashes.h"
3838
#include "unix.h"
39+
#include "logging_old.h"
3940
#include "logging.h"
4041
#include "string_lib.h"
4142
#include "signals.h"

‎cf-execd/exec-config.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "rlist.h"
77
#include "env_context.h"
88
#include "conversion.h"
9-
#include "logging.h"
9+
#include "logging_old.h"
1010
#include "generic_agent.h" // TODO: fix
1111

1212
#ifdef HAVE_NOVA

‎cf-gendoc/cf-gendoc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include "sort.h"
3333
#include "conversion.h"
3434
#include "expand.h"
35-
#include "logging.h"
35+
#include "logging_old.h"
3636
#include "misc_lib.h"
3737

3838
static void GenerateManual(EvalContext *ctx);

‎cf-gendoc/manual.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include "scope.h"
3838
#include "files_interfaces.h"
3939
#include "assoc.h"
40-
#include "logging.h"
40+
#include "logging_old.h"
4141
#include "rlist.h"
4242

4343
#ifdef HAVE_NOVA

‎cf-key/cf-key-functions.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include "files_interfaces.h"
3434
#include "files_hashes.h"
3535
#include "keyring.h"
36-
#include "logging.h"
36+
#include "logging_old.h"
3737
#include "communication.h"
3838
#include "env_context.h"
3939
#include "crypto.h"

‎cf-key/cf-key.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include "env_context.h"
3737
#include "crypto.h"
3838
#include "sysinfo.h"
39-
#include "logging.h"
39+
#include "logging_old.h"
4040

4141
#include "cf-key-functions.h"
4242

‎cf-monitord/cf-monitord.c

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include "env_monitor.h"
3030
#include "conversion.h"
3131
#include "vars.h"
32+
#include "logging_old.h"
3233
#include "logging.h"
3334
#include "signals.h"
3435
#include "scope.h"

‎cf-monitord/env_monitor.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include "expand.h"
3737
#include "scope.h"
3838
#include "sysinfo.h"
39-
#include "logging.h"
39+
#include "logging_old.h"
4040
#include "signals.h"
4141
#include "locks.h"
4242
#include "exec_tools.h"

‎cf-monitord/mon_cpu.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "cf3.defs.h"
2626

2727
#include "mon.h"
28-
#include "logging.h"
28+
#include "logging_old.h"
2929

3030
#if !defined(__MINGW32__)
3131

‎cf-monitord/mon_disk.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
#include "mon.h"
2828
#include "files_interfaces.h"
29-
#include "logging.h"
29+
#include "logging_old.h"
3030

3131
/* Globals */
3232

‎cf-monitord/mon_load.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "cf3.defs.h"
2626

2727
#include "mon.h"
28-
#include "logging.h"
28+
#include "logging_old.h"
2929

3030
#ifdef HAVE_SYS_LOADAVG_H
3131
# include <sys/loadavg.h>

‎cf-monitord/mon_network.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "files_names.h"
3030
#include "files_interfaces.h"
3131
#include "files_lib.h"
32-
#include "logging.h"
32+
#include "logging_old.h"
3333
#include "pipes.h"
3434

3535
/* Globals */

‎cf-monitord/mon_network_sniffer.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "files_interfaces.h"
3030
#include "mon.h"
3131
#include "item_lib.h"
32-
#include "logging.h"
32+
#include "logging_old.h"
3333
#include "pipes.h"
3434
#include "signals.h"
3535
#include "string_lib.h"

0 commit comments

Comments
 (0)