diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2017-06-30 15:01:19 -0400 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2017-06-30 15:01:19 -0400 |
| commit | ef3ceabae76ccae0a67d6abb067b4618c4531d96 (patch) | |
| tree | 3460554c08947faabbb6f827b18e454b45837845 /debian/patches/03-adjust-syslog-facility.diff | |
| parent | 4ef577f45aab85ea5591d2957d280d6533e66124 (diff) | |
| parent | 41a0c4dba5b0c6283bc9a1bfa09822e8cb2cb3a5 (diff) | |
boxbackup (0.12~gitcf52058f-3) unstable; urgency=medium
* QA upload.
* Run the testsuite on amd64 and i386 only (Closes: #866372)
[dgit import unpatched boxbackup 0.12~gitcf52058f-3]
Diffstat (limited to 'debian/patches/03-adjust-syslog-facility.diff')
| -rw-r--r-- | debian/patches/03-adjust-syslog-facility.diff | 50 |
1 files changed, 50 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..4856026d --- /dev/null +++ b/debian/patches/03-adjust-syslog-facility.diff @@ -0,0 +1,50 @@ +change default syslog facility from LOG_LOCAL6 to LOG_DAEMON + +--- a/lib/common/Logging.cpp ++++ b/lib/common/Logging.cpp +@@ -411,7 +411,7 @@ bool Syslog::Log(Log::Level level, const + return true; + } + +-Syslog::Syslog() : mFacility(LOG_LOCAL6) ++Syslog::Syslog() : mFacility(LOG_DAEMON) + { + ::openlog("Box Backup", LOG_PID, mFacility); + } +@@ -454,8 +454,8 @@ int Syslog::GetNamedFacility(const std:: + #undef CASE_RETURN + + BOX_ERROR("Unknown log facility '" << rFacility << "', " +- "using default LOCAL6"); +- return LOG_LOCAL6; ++ "using default DAEMON"); ++ return LOG_DAEMON; + } + + bool FileLogger::Log(Log::Level Level, const std::string& file, int line, +--- a/docs/docbook/adminguide.xml ++++ b/docs/docbook/adminguide.xml +@@ -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> + +--- a/lib/bbstored/BackupStoreDaemon.cpp ++++ b/lib/bbstored/BackupStoreDaemon.cpp +@@ -203,7 +203,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 |