X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FDaemon%2FDaemon.cc;h=c60939ab77908e96bfe5e28400beca60b704fbc8;hb=cb2920bff3d35e88f195be7f5e03c217b9cf484c;hp=849f4c6e2abdb1f6350eed1a08610403123d7284;hpb=7a4d13b962b9cd20e2e0bad0753a9bb1ca3219c4;p=senf.git

diff --git a/Utils/Daemon/Daemon.cc b/Utils/Daemon/Daemon.cc
index 849f4c6..c60939a 100644
--- a/Utils/Daemon/Daemon.cc
+++ b/Utils/Daemon/Daemon.cc
@@ -38,6 +38,7 @@
 #include <algorithm>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/trim.hpp>
+#include <boost/format.hpp>
 #include "../Exception.hh"
 #include "../membind.hh"
 
@@ -53,8 +54,14 @@
 
 prefix_ senf::Daemon::~Daemon()
 {
-    if (! pidfile_.empty())
-        LIBC_CALL( ::unlink, (pidfile_.c_str()) );
+    if (! pidfile_.empty()) {
+        try {
+            LIBC_CALL( ::unlink, (pidfile_.c_str()) );
+        } catch (SystemException e) {
+            e << "; could not unlink " << pidfile_.c_str();
+            throw;
+        }
+    }
 }
 
 prefix_ void senf::Daemon::daemonize(bool v)
@@ -67,6 +74,14 @@ prefix_ bool senf::Daemon::daemon()
     return daemonize_;
 }
 
+prefix_ int senf::Daemon::argc() {
+    return argc_;
+}
+
+prefix_ char const ** senf::Daemon::argv() {
+    return argv_;
+}
+
 prefix_ void senf::Daemon::consoleLog(std::string const & path, StdStream which)
 {
     switch (which) {
@@ -308,6 +323,7 @@ prefix_ bool senf::Daemon::pidfileCreate()
     // was some race condition, probably over NFS.
 
     std::string tempname;
+    boost::format linkErrorFormat("; could not link \"%1%\" to \"%2%\"");
 
     {
         char hostname[HOST_NAME_MAX+1];
@@ -326,7 +342,8 @@ prefix_ bool senf::Daemon::pidfileCreate()
 
         if (::link(tempname.c_str(), pidfile_.c_str()) < 0) {
             if (errno != EEXIST) 
-                throw SystemException("::link()");
+                throw SystemException("::link()")
+                    << linkErrorFormat % pidfile_.c_str() % tempname.c_str();
         }
         else {
             struct ::stat s;
@@ -356,7 +373,9 @@ prefix_ bool senf::Daemon::pidfileCreate()
 
         LIBC_CALL( ::unlink, (tempname.c_str() ));
         if (::link(pidfile_.c_str(), tempname.c_str()) < 0) {
-            if (errno != ENOENT) throw SystemException("::link()");
+            if (errno != ENOENT)
+                throw SystemException("::link()")
+                    << linkErrorFormat % tempname.c_str() % pidfile_.c_str();
             // Hmm ... the pidfile mysteriously disappeared ... try again.
             continue;
         }