| -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 @@ -31,4 +31,10 @@ 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( std::string macaddress,std::string cnonce, @@ -61,8 +67,5 @@ 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); } int eyefiService::GetPhotoStatus( @@ -70,5 +73,5 @@ int eyefiService::GetPhotoStatus( std::string filename, long filesize, std::string filesignature, int flags, - struct rns__GetPhotoStatusResponse &r ) { + struct rns__GetPhotoStatusResponse &r ) try { #ifndef NDEBUG syslog(LOG_DEBUG, @@ -88,9 +91,9 @@ int eyefiService::GetPhotoStatus( r.fileid = 1; r.offset = 0; return SOAP_OK; -} +}catch(const std::exception& e) { return E(this,"GetPhotoStatus",e); } int eyefiService::MarkLastPhotoInRoll( std::string macaddress, int mergedelta, - struct rns__MarkLastPhotoInRollResponse&/* r */ ) { + struct rns__MarkLastPhotoInRollResponse&/* r */ ) try { #ifndef NDEBUG syslog(LOG_DEBUG, @@ -111,5 +114,5 @@ int eyefiService::MarkLastPhotoInRoll( keep_alive = 0; return SOAP_OK; -} +}catch(const std::exception& e) { return E(this,"MarkLastPhotoInRoll",e); } int eyefiService::UploadPhoto( @@ -117,5 +120,5 @@ int eyefiService::UploadPhoto( std::string filename, long filesize, std::string filesignature, std::string encryption, int flags, - struct rns__UploadPhotoResponse& r ) { + struct rns__UploadPhotoResponse& r ) try { #ifndef NDEBUG syslog(LOG_DEBUG, @@ -227,3 +230,3 @@ int eyefiService::UploadPhoto( r.success = true; return SOAP_OK; -} +}catch(const std::exception& e) { return E(this,"UploadPhoto",e); } |