diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2009-04-02 14:16:01 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2009-04-02 14:16:01 +0200 |
| commit | 7ea0db364611d3c1cd7b2069d60d1841383d9d14 (patch) | |
| tree | 58fce0827405c6191f67bb39c4d2aa74762670cc /debian/patches/03-adjust-syslog-facility.diff | |
| parent | 69e8caa9859deb260f01dc4904125e7a0fa54968 (diff) | |
rebase 03-adjust-syslog-facility.diff for new upstream
Diffstat (limited to 'debian/patches/03-adjust-syslog-facility.diff')
| -rw-r--r-- | debian/patches/03-adjust-syslog-facility.diff | 60 |
1 files changed, 23 insertions, 37 deletions
diff --git a/debian/patches/03-adjust-syslog-facility.diff b/debian/patches/03-adjust-syslog-facility.diff index 311b8dcf..1f54e4fb 100644 --- a/debian/patches/03-adjust-syslog-facility.diff +++ b/debian/patches/03-adjust-syslog-facility.diff @@ -1,7 +1,8 @@ -=== 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() +change default syslog facility from LOG_LOCAL6 to LOG_DAEMON + +--- a/bin/bbstored/BackupStoreDaemon.cpp ++++ b/bin/bbstored/BackupStoreDaemon.cpp +@@ -203,7 +203,7 @@ void BackupStoreDaemon::Run() SetProcessTitle("housekeeping, idle"); whichSocket = 1; // Change the log name @@ -10,44 +11,30 @@ // 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 +--- a/lib/common/Logging.cpp ++++ b/lib/common/Logging.cpp +@@ -399,7 +399,7 @@ bool Syslog::Log(Log::Level level, const + return true; + } - Syslog::Syslog() +-Syslog::Syslog() : mFacility(LOG_LOCAL6) ++Syslog::Syslog() : mFacility(LOG_DAEMON) { -- ::openlog("Box Backup", LOG_PID, LOG_LOCAL6); -+ ::openlog("Box Backup", LOG_PID, LOG_DAEMON); + ::openlog("Box Backup", LOG_PID, mFacility); } +@@ -437,8 +437,8 @@ int Syslog::GetNamedFacility(const std:: + #undef CASE_RETURN - 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); + BOX_ERROR("Unknown log facility '" << rFacility << "', " +- "using default LOCAL6"); +- return LOG_LOCAL6; ++ "using default DAEMON"); ++ return 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 + bool FileLogger::Log(Log::Level Level, const std::string& rFile, +--- 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> @@ -61,4 +48,3 @@ <programlisting>touch /var/log/box touch /var/log/raidfile</programlisting> - |