summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2012-01-20 22:40:10 (UTC)
committer Michael Krelin <hacker@klever.net>2012-01-20 22:40:10 (UTC)
commit8035dab48b39f1b0bb9e7aba5ce69fbf59259406 (patch) (unidiff)
treeaca1c9d7cf86d1194cca595c9e84bb0e374fdc07
parent55df23325d4305ea547331e64ca660ba906dc0e6 (diff)
downloadiii-8035dab48b39f1b0bb9e7aba5ce69fbf59259406.zip
iii-8035dab48b39f1b0bb9e7aba5ce69fbf59259406.tar.gz
iii-8035dab48b39f1b0bb9e7aba5ce69fbf59259406.tar.bz2
more startup sanity checks
Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--NEWS.xml1
-rw-r--r--src/iiid.cc11
2 files changed, 12 insertions, 0 deletions
diff --git a/NEWS.xml b/NEWS.xml
index e37cd46..0c6ff09 100644
--- a/NEWS.xml
+++ b/NEWS.xml
@@ -1,26 +1,27 @@
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>
12 <ni>improved compatibility with Geo X2 card</ni> 13 <ni>improved compatibility with Geo X2 card</ni>
13 <ni>added script for post-processing uploaded photo (sort by exif 14 <ni>added script for post-processing uploaded photo (sort by exif
14 timestamp)</ni> 15 timestamp)</ni>
15 <ni>added utility to extract chunks from RIFF (video) files to assist in 16 <ni>added utility to extract chunks from RIFF (video) files to assist in
16 automatic sorting of videos</ni> 17 automatic sorting of videos</ni>
17 <ni>minor internal changes</ni> 18 <ni>minor internal changes</ni>
18 </version> 19 </version>
19 <version version="0.1" date="April 5th, 2009"> 20 <version version="0.1" date="April 5th, 2009">
20 <ni>integrity digest verification</ni> 21 <ni>integrity digest verification</ni>
21 <ni>try to create upload directory if it doesn't exist</ni> 22 <ni>try to create upload directory if it doesn't exist</ni>
22 </version> 23 </version>
23 <version version="0.0" date="March 8th, 2009"> 24 <version version="0.0" date="March 8th, 2009">
24 <ni>Initial release</ni> 25 <ni>Initial release</ni>
25 </version> 26 </version>
26</news> 27</news>
diff --git a/src/iiid.cc b/src/iiid.cc
index c026050..d655fe3 100644
--- a/src/iiid.cc
+++ b/src/iiid.cc
@@ -1,86 +1,97 @@
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
9#include "config.h" 11#include "config.h"
10 12
11#include "eyefi.nsmap" 13#include "eyefi.nsmap"
12 14
13#define PHEADER \ 15#define PHEADER \
14 PACKAGE " Version " VERSION "\n" \ 16 PACKAGE " Version " VERSION "\n" \
15 "Copyright (c) 2009 Klever Group" 17 "Copyright (c) 2009 Klever Group"
16 18
17int main(int argc,char **argv) try { 19int main(int argc,char **argv) try {
18 20
19 int port = 59278; 21 int port = 59278;
20 22
21 while(true) { 23 while(true) {
22 static struct option opts[] = { 24 static struct option opts[] = {
23 { "help", no_argument, 0, 'h' }, 25 { "help", no_argument, 0, 'h' },
24 { "usage", no_argument, 0, 'h' }, 26 { "usage", no_argument, 0, 'h' },
25 { "version", no_argument, 0, 'V' }, 27 { "version", no_argument, 0, 'V' },
26 { "license", no_argument, 0, 'L' }, 28 { "license", no_argument, 0, 'L' },
27 { "port", required_argument, 0, 'p' }, 29 { "port", required_argument, 0, 'p' },
28 { NULL, 0, 0, 0 } 30 { NULL, 0, 0, 0 }
29 }; 31 };
30 int c = getopt_long(argc,argv,"hVLp:",opts,NULL); 32 int c = getopt_long(argc,argv,"hVLp:",opts,NULL);
31 if(c==-1) break; 33 if(c==-1) break;
32 switch(c) { 34 switch(c) {
33 case 'h': 35 case 'h':
34 std::cerr << PHEADER << std::endl << std::endl 36 std::cerr << PHEADER << std::endl << std::endl
35 << " " << argv[0] << " [options]" << std::endl 37 << " " << argv[0] << " [options]" << std::endl
36 << std::endl << 38 << std::endl <<
37 " -h, --help,\n" 39 " -h, --help,\n"
38 " --usage display this text\n" 40 " --usage display this text\n"
39 " -V, --version display version information\n" 41 " -V, --version display version information\n"
40 " -L, --license show license\n" 42 " -L, --license show license\n"
41 " -p <port>, --port=<port> port to listen to\n" 43 " -p <port>, --port=<port> port to listen to\n"
42 " (you're not likely to ever need it)\n" 44 " (you're not likely to ever need it)\n"
43 << std::endl << std::endl; 45 << std::endl << std::endl;
44 exit(0); 46 exit(0);
45 break; 47 break;
46 case 'V': 48 case 'V':
47 std::cerr << VERSION << std::endl; 49 std::cerr << VERSION << std::endl;
48 exit(0); 50 exit(0);
49 break; 51 break;
50 case 'L': 52 case 'L':
51 extern const char *COPYING; 53 extern const char *COPYING;
52 std::cerr << COPYING << std::endl; 54 std::cerr << COPYING << std::endl;
53 exit(0); 55 exit(0);
54 break; 56 break;
55 case 'p': 57 case 'p':
56 port = 0xffff&strtol(optarg,0,0); 58 port = 0xffff&strtol(optarg,0,0);
57 if(errno) { 59 if(errno) {
58 std::cerr << "Failed to parse port number" << std::endl; 60 std::cerr << "Failed to parse port number" << std::endl;
59 exit(1); 61 exit(1);
60 } 62 }
61 break; 63 break;
62 default: 64 default:
63 std::cerr << "Huh?" << std::endl; 65 std::cerr << "Huh?" << std::endl;
64 exit(1); 66 exit(1);
65 break; 67 break;
66 } 68 }
67 } 69 }
68 70
69 const char *ident = rindex(*argv,'/'); 71 const char *ident = rindex(*argv,'/');
70 if(ident) 72 if(ident)
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");
83 syslog(LOG_CRIT,"Exception: %s",e.what()); 94 syslog(LOG_CRIT,"Exception: %s",e.what());
84 return 1; 95 return 1;
85} 96}
86 97