summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/eyefiservice.cc23
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() {
32 32
33static int E(eyefiService* efs,const char *c,const std::exception& e) {
34 efs->keep_alive=0;
35 syslog(LOG_ERR,"error while processing %s: %s",c,e.what());
36 return efs->soap_receiverfault(gnu::autosprintf("error processing %s",c),0);
37}
38
33int eyefiService::StartSession( 39int eyefiService::StartSession(
@@ -62,6 +68,3 @@ int eyefiService::StartSession(
62 return SOAP_OK; 68 return SOAP_OK;
63}catch(std::runtime_error& e) { 69}catch(const std::exception& e) { return E(this,"StartSession",e); }
64 syslog(LOG_ERR,"error while processing StartSession: %s",e.what());
65 return soap_receiverfault(e.what(),0);
66}
67 70
@@ -71,3 +74,3 @@ int eyefiService::GetPhotoStatus(
71 int flags, 74 int flags,
72 struct rns__GetPhotoStatusResponse &r ) { 75 struct rns__GetPhotoStatusResponse &r ) try {
73#ifndef NDEBUG 76#ifndef NDEBUG
@@ -89,3 +92,3 @@ int eyefiService::GetPhotoStatus(
89 return SOAP_OK; 92 return SOAP_OK;
90} 93}catch(const std::exception& e) { return E(this,"GetPhotoStatus",e); }
91 94
@@ -93,3 +96,3 @@ int eyefiService::MarkLastPhotoInRoll(
93 std::string macaddress, int mergedelta, 96 std::string macaddress, int mergedelta,
94 struct rns__MarkLastPhotoInRollResponse&/* r */ ) { 97 struct rns__MarkLastPhotoInRollResponse&/* r */ ) try {
95#ifndef NDEBUG 98#ifndef NDEBUG
@@ -112,3 +115,3 @@ int eyefiService::MarkLastPhotoInRoll(
112 return SOAP_OK; 115 return SOAP_OK;
113} 116}catch(const std::exception& e) { return E(this,"MarkLastPhotoInRoll",e); }
114 117
@@ -118,3 +121,3 @@ int eyefiService::UploadPhoto(
118 std::string encryption, int flags, 121 std::string encryption, int flags,
119 struct rns__UploadPhotoResponse& r ) { 122 struct rns__UploadPhotoResponse& r ) try {
120#ifndef NDEBUG 123#ifndef NDEBUG
@@ -228,2 +231,2 @@ int eyefiService::UploadPhoto(
228 return SOAP_OK; 231 return SOAP_OK;
229} 232}catch(const std::exception& e) { return E(this,"UploadPhoto",e); }