diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2009-03-31 21:43:58 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2009-03-31 21:43:58 +0200 |
| commit | 2e1992f26f211ce4d0f5f3fa3bda4b1176c554ce (patch) | |
| tree | adb0db43eb538e2c3b072d253c2c449b70b1158d /debian/patches | |
| parent | 517fd52f320f008e23292c00759a39cec42e2ee0 (diff) | |
add 03-adjust-syslog-facility.diff as quilt patch, unapply from source tree
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/03-adjust-syslog-facility.diff | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/debian/patches/03-adjust-syslog-facility.diff b/debian/patches/03-adjust-syslog-facility.diff new file mode 100644 index 00000000..311b8dcf --- /dev/null +++ b/debian/patches/03-adjust-syslog-facility.diff @@ -0,0 +1,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> + + |