| -rw-r--r-- | src/eyefiservice.cc | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc index e89b2fc..276977a 100644 --- a/src/eyefiservice.cc +++ b/src/eyefiservice.cc @@ -32,2 +32,8 @@ static bool detached_child() { +static int E(eyefiService* efs,const char *c,const std::exception& e) { + efs->keep_alive=0; + syslog(LOG_ERR,"error while processing %s: %s",c,e.what()); + return efs->soap_receiverfault(gnu::autosprintf("error processing %s",c),0); +} + int eyefiService::StartSession( @@ -62,6 +68,3 @@ int eyefiService::StartSession( return SOAP_OK; -}catch(std::runtime_error& e) { - syslog(LOG_ERR,"error while processing StartSession: %s",e.what()); - return soap_receiverfault(e.what(),0); -} +}catch(const std::exception& e) { return E(this,"StartSession",e); } @@ -71,3 +74,3 @@ int eyefiService::GetPhotoStatus( int flags, - struct rns__GetPhotoStatusResponse &r ) { + struct rns__GetPhotoStatusResponse &r ) try { #ifndef NDEBUG @@ -89,3 +92,3 @@ int eyefiService::GetPhotoStatus( return SOAP_OK; -} +}catch(const std::exception& e) { return E(this,"GetPhotoStatus",e); } @@ -93,3 +96,3 @@ int eyefiService::MarkLastPhotoInRoll( std::string macaddress, int mergedelta, - struct rns__MarkLastPhotoInRollResponse&/* r */ ) { + struct rns__MarkLastPhotoInRollResponse&/* r */ ) try { #ifndef NDEBUG @@ -112,3 +115,3 @@ int eyefiService::MarkLastPhotoInRoll( return SOAP_OK; -} +}catch(const std::exception& e) { return E(this,"MarkLastPhotoInRoll",e); } @@ -118,3 +121,3 @@ int eyefiService::UploadPhoto( std::string encryption, int flags, - struct rns__UploadPhotoResponse& r ) { + struct rns__UploadPhotoResponse& r ) try { #ifndef NDEBUG @@ -228,2 +231,2 @@ int eyefiService::UploadPhoto( return SOAP_OK; -} +}catch(const std::exception& e) { return E(this,"UploadPhoto",e); } |