1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
|
=== modified file 'bin/bbstored/BackupStoreDaemon.cpp'
--- old/bin/bbstored/BackupStoreDaemon.cpp 2009-03-31 13:58:19 +0000
+++ new/bin/bbstored/BackupStoreDaemon.cpp 2009-03-31 13:58:21 +0000
@@ -201,7 +201,7 @@ void BackupStoreDaemon::Run()
SetProcessTitle("housekeeping, idle");
whichSocket = 1;
// Change the log name
- ::openlog("bbstored/hk", LOG_PID, LOG_LOCAL6);
+ ::openlog("bbstored/hk", LOG_PID, LOG_DAEMON);
// Log that housekeeping started
BOX_INFO("Housekeeping process started");
// Ignore term and hup
=== modified file 'lib/common/Logging.cpp'
--- old/lib/common/Logging.cpp 2009-03-31 13:58:19 +0000
+++ new/lib/common/Logging.cpp 2009-03-31 13:58:22 +0000
@@ -332,7 +336,7 @@ bool Syslog::Log(Log::Level level, const
Syslog::Syslog()
{
- ::openlog("Box Backup", LOG_PID, LOG_LOCAL6);
+ ::openlog("Box Backup", LOG_PID, LOG_DAEMON);
}
Syslog::~Syslog()
@@ -344,5 +348,5 @@ void Syslog::SetProgramName(const std::s
{
mName = rProgramName;
::closelog();
- ::openlog(mName.c_str(), LOG_PID, LOG_LOCAL6);
+ ::openlog(mName.c_str(), LOG_PID, LOG_DAEMON);
}
=== modified file 'lib/win32/emu.h'
--- old/lib/win32/emu.h 2009-03-31 13:58:19 +0000
+++ new/lib/win32/emu.h 2009-03-31 13:58:22 +0000
@@ -253,8 +253,7 @@ HANDLE openfile(const char *filename, in
#define LOG_ERR 3
#define LOG_CRIT LOG_ERR
#define LOG_PID 0
-#define LOG_LOCAL5 0
-#define LOG_LOCAL6 0
+#define LOG_DAEMON 0
void openlog (const char * daemonName, int, int);
void closelog(void);
=== modified file 'documentation/adminguide.xml'
--- old/documentation/adminguide.xml 2008-02-02 07:31:52 +0000
+++ new/documentation/adminguide.xml 2009-03-30 21:10:14 +0000
@@ -286,6 +286,12 @@ local5.info /var
<para><emphasis role="bold">Note:</emphasis> Separators must be tabs,
otherwise these entries will be ignored.</para>
+ <para><emphasis role="bold">Note2:</emphasis> The packaged
+ debian and ubuntu versions of boxbackup do not log to local6,
+ but to the more standard 'daemon' facility. This means you
+ should not have anything to do to your syslog configuration,
+ since it is configured to be logged by default.</para>
+
<programlisting>touch /var/log/box
touch /var/log/raidfile</programlisting>
|
