author | Michael Krelin <hacker@klever.net> | 2012-01-20 22:40:10 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2012-01-20 22:40:10 (UTC) |
commit | 8035dab48b39f1b0bb9e7aba5ce69fbf59259406 (patch) (unidiff) | |
tree | aca1c9d7cf86d1194cca595c9e84bb0e374fdc07 | |
parent | 55df23325d4305ea547331e64ca660ba906dc0e6 (diff) | |
download | iii-8035dab48b39f1b0bb9e7aba5ce69fbf59259406.zip iii-8035dab48b39f1b0bb9e7aba5ce69fbf59259406.tar.gz iii-8035dab48b39f1b0bb9e7aba5ce69fbf59259406.tar.bz2 |
more startup sanity checks
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | NEWS.xml | 1 | ||||
-rw-r--r-- | src/iiid.cc | 11 |
2 files changed, 12 insertions, 0 deletions
@@ -1,11 +1,12 @@ | |||
1 | <?xml version="1.0" encoding="us-ascii"?> | 1 | <?xml version="1.0" encoding="us-ascii"?> |
2 | <news> | 2 | <news> |
3 | <version version="" date=""> | 3 | <version version="" date=""> |
4 | <ni>optimized integrity digest calculation memory usage</ni> | 4 | <ni>optimized integrity digest calculation memory usage</ni> |
5 | <ni>report the lack of config file for the card</ni> | 5 | <ni>report the lack of config file for the card</ni> |
6 | <ni>do some startup checks for config files</ni> | ||
6 | <ni>Extended list of supported file types</ni> | 7 | <ni>Extended list of supported file types</ni> |
7 | <ni>minor bugfixes</ni> | 8 | <ni>minor bugfixes</ni> |
8 | </version> | 9 | </version> |
9 | <version version="0.2" date="March 20th, 2011"> | 10 | <version version="0.2" date="March 20th, 2011"> |
10 | <ni>extract and store .log files supplied for geotagging purpose</ni> | 11 | <ni>extract and store .log files supplied for geotagging purpose</ni> |
11 | <ni>added a sample script for geotagging photos based on the log file</ni> | 12 | <ni>added a sample script for geotagging photos based on the log file</ni> |
diff --git a/src/iiid.cc b/src/iiid.cc index c026050..d655fe3 100644 --- a/src/iiid.cc +++ b/src/iiid.cc | |||
@@ -1,8 +1,10 @@ | |||
1 | #include <syslog.h> | 1 | #include <syslog.h> |
2 | #include <getopt.h> | 2 | #include <getopt.h> |
3 | #include <sys/stat.h> | ||
4 | #include <glob.h> | ||
3 | #include <iostream> | 5 | #include <iostream> |
4 | #include <cassert> | 6 | #include <cassert> |
5 | #include <stdexcept> | 7 | #include <stdexcept> |
6 | #include "eyetil.h" | 8 | #include "eyetil.h" |
7 | #include "eyefiworker.h" | 9 | #include "eyefiworker.h" |
8 | 10 | ||
@@ -71,12 +73,21 @@ int main(int argc,char **argv) try { | |||
71 | ++ident; | 73 | ++ident; |
72 | else | 74 | else |
73 | ident = *argv; | 75 | ident = *argv; |
74 | openlog(ident,LOG_PERROR|LOG_PID,LOG_DAEMON); | 76 | openlog(ident,LOG_PERROR|LOG_PID,LOG_DAEMON); |
75 | syslog(LOG_INFO,"Starting iii eye-fi manager"); | 77 | syslog(LOG_INFO,"Starting iii eye-fi manager"); |
76 | 78 | ||
79 | struct stat st; | ||
80 | if(stat(EYEKIN_CONF_DIR,&st) || !S_ISDIR(st.st_mode)) | ||
81 | syslog(LOG_WARNING,"configuration directory '%s' does not exist or is not a directory",EYEKIN_CONF_DIR); | ||
82 | glob_t g; int rg = glob(EYEKIN_CONF_DIR"/????????????.conf",GLOB_NOSORT,NULL,&g); | ||
83 | if(rg || !g.gl_pathc) | ||
84 | syslog(LOG_WARNING,"I see nothing resembling a card config in '%s'",EYEKIN_CONF_DIR); | ||
85 | else | ||
86 | globfree(&g); | ||
87 | |||
77 | eyefiworker().run(port); | 88 | eyefiworker().run(port); |
78 | 89 | ||
79 | closelog(); | 90 | closelog(); |
80 | return 0; | 91 | return 0; |
81 | } catch(std::exception& e) { | 92 | } catch(std::exception& e) { |
82 | syslog(LOG_CRIT,"Exiting iii daemon, because of error condition"); | 93 | syslog(LOG_CRIT,"Exiting iii daemon, because of error condition"); |