4 files changed, 12 insertions, 2 deletions

diff --git a/src/eyefiworker.cc b/src/eyefiworker.cc
index ac75fc1..1979b46 100644
--- a/src/eyefiworker.cc
+++ b/src/eyefiworker.cc
@@ -32,4 +32,6 @@ eyefiworker::eyefiworker()
             ;
     }
+eyefiworker::~eyefiworker() {
+}
 
 int eyefiworker::run(int bindport) {
@@ -57,5 +59,5 @@ int eyefiworker::run(int bindport) {
             }
 #endif /* NDEBUG */
-            _exit(0);
+            throw throwable_exit(0);
         }
         close(socket); socket = SOAP_INVALID_SOCKET;
diff --git a/src/eyefiworker.h b/src/eyefiworker.h
index 6d4082c..6cdecff 100644
--- a/src/eyefiworker.h
+++ b/src/eyefiworker.h
@@ -8,4 +8,5 @@ class eyefiworker : public eyefiService {
 
         eyefiworker();
+        ~eyefiworker();
 
         int run(int port) __attribute__ ((noreturn));
diff --git a/src/eyetil.h b/src/eyetil.h
index eff2c43..03b9ba8 100644
--- a/src/eyetil.h
+++ b/src/eyetil.h
@@ -8,4 +8,9 @@
 #include "openssl/md5.h"
 
+struct throwable_exit {
+    int rc;
+    throwable_exit(int rc_) : rc(rc_) { }
+};
+
 class binary_t : public std::vector<unsigned char> {
     public:
diff --git a/src/iiid.cc b/src/iiid.cc
index d655fe3..b3dd3bf 100644
--- a/src/iiid.cc
+++ b/src/iiid.cc
@@ -90,5 +90,7 @@ int main(int argc,char **argv) try {
     closelog();
     return 0;
-} catch(std::exception& e) {
+} catch(const throwable_exit& e) {
+    return e.rc;
+} catch(const std::exception& e) {
     syslog(LOG_CRIT,"Exiting iii daemon, because of error condition");
     syslog(LOG_CRIT,"Exception: %s",e.what());