summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2011-03-17 22:13:02 (UTC)
committer Michael Krelin <hacker@klever.net>2011-03-17 22:13:02 (UTC)
commitcfeffc5315dd193033182252bb0e4558228e79d1 (patch) (side-by-side diff)
tree293fba43067af552db1b84ecebbded23233585f1
parent59aa03f15cdc33a93ad604392747a36634996aab (diff)
downloadiii-cfeffc5315dd193033182252bb0e4558228e79d1.zip
iii-cfeffc5315dd193033182252bb0e4558228e79d1.tar.gz
iii-cfeffc5315dd193033182252bb0e4558228e79d1.tar.bz2
catch and report error during StartSession
Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--src/eyefiservice.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/eyefiservice.cc b/src/eyefiservice.cc
index 5cbc396..fb2a90d 100644
--- a/src/eyefiservice.cc
+++ b/src/eyefiservice.cc
@@ -39,13 +39,13 @@ static bool detached_child() {
return false;
}
int eyefiService::StartSession(
std::string macaddress,std::string cnonce,
int transfermode,long transfermodetimestamp,
- struct rns__StartSessionResponse &r ) {
+ struct rns__StartSessionResponse &r ) try {
#ifndef NDEBUG
syslog(LOG_DEBUG,
"StartSession request from %s with cnonce=%s, transfermode=%d, transfermodetimestamp=%ld",
macaddress.c_str(), cnonce.c_str(), transfermode, transfermodetimestamp );
#endif
r.credential = binary_t(macaddress+cnonce+eyekinfig_t(macaddress).get_upload_key()).md5().hex();
@@ -65,12 +65,14 @@ int eyefiService::StartSession(
execv("/bin/sh",argv);
syslog(LOG_ERR,"Failed to execute '%s'",cmd.c_str());
_exit(-1);
}
}
return SOAP_OK;
+}catch(std::runtime_error& e) {
+ syslog(LOG_ERR,"error while processing StartSession: %s",e.what());
}
int eyefiService::GetPhotoStatus(
std::string credential, std::string macaddress,
std::string filename, long filesize, std::string filesignature,
int flags,