author | Oleg Deribas <oderibas+git@gmail.com> | 2014-02-14 14:41:37 (UTC) |
---|---|---|
committer | Oleg Deribas <oderibas+git@gmail.com> | 2014-02-14 14:41:37 (UTC) |
commit | 4e64ab71bf43406f41d0a048f5a7a041b4cd798d (patch) (unidiff) | |
tree | 0273b4bd9773f38b4eb40e5841dd86cb99ca219d | |
parent | f924f4f199f289a18b642de632ec69558f3af3f9 (diff) | |
download | iii-4e64ab71bf43406f41d0a048f5a7a041b4cd798d.zip iii-4e64ab71bf43406f41d0a048f5a7a041b4cd798d.tar.gz iii-4e64ab71bf43406f41d0a048f5a7a041b4cd798d.tar.bz2 |
Add command line option to daemonize iiid process
-rw-r--r-- | src/iiid.cc | 46 |
1 files changed, 44 insertions, 2 deletions
diff --git a/src/iiid.cc b/src/iiid.cc index b3dd3bf..bd65001 100644 --- a/src/iiid.cc +++ b/src/iiid.cc | |||
@@ -14,39 +14,42 @@ | |||
14 | 14 | ||
15 | #define PHEADER \ | 15 | #define PHEADER \ |
16 | PACKAGE " Version " VERSION "\n" \ | 16 | PACKAGE " Version " VERSION "\n" \ |
17 | "Copyright (c) 2009 Klever Group" | 17 | "Copyright (c) 2009 Klever Group" |
18 | 18 | ||
19 | int main(int argc,char **argv) try { | 19 | int main(int argc,char **argv) try { |
20 | 20 | ||
21 | int port = 59278; | 21 | int port = 59278; |
22 | bool daemon_mode = false; | ||
22 | 23 | ||
23 | while(true) { | 24 | while(true) { |
24 | static struct option opts[] = { | 25 | static struct option opts[] = { |
25 | { "help", no_argument, 0, 'h' }, | 26 | { "help", no_argument, 0, 'h' }, |
26 | { "usage", no_argument, 0, 'h' }, | 27 | { "usage", no_argument, 0, 'h' }, |
27 | { "version", no_argument, 0, 'V' }, | 28 | { "version", no_argument, 0, 'V' }, |
28 | { "license", no_argument, 0, 'L' }, | 29 | { "license", no_argument, 0, 'L' }, |
29 | { "port", required_argument, 0, 'p' }, | 30 | { "port", required_argument, 0, 'p' }, |
31 | { "daemon", no_argument, 0, 'd' }, | ||
30 | { NULL, 0, 0, 0 } | 32 | { NULL, 0, 0, 0 } |
31 | }; | 33 | }; |
32 | int c = getopt_long(argc,argv,"hVLp:",opts,NULL); | 34 | int c = getopt_long(argc,argv,"hVLp:d",opts,NULL); |
33 | if(c==-1) break; | 35 | if(c==-1) break; |
34 | switch(c) { | 36 | switch(c) { |
35 | case 'h': | 37 | case 'h': |
36 | std::cerr << PHEADER << std::endl << std::endl | 38 | std::cerr << PHEADER << std::endl << std::endl |
37 | << " " << argv[0] << " [options]" << std::endl | 39 | << " " << argv[0] << " [options]" << std::endl |
38 | << std::endl << | 40 | << std::endl << |
39 | " -h, --help,\n" | 41 | " -h, --help,\n" |
40 | " --usage display this text\n" | 42 | " --usage display this text\n" |
41 | " -V, --version display version information\n" | 43 | " -V, --version display version information\n" |
42 | " -L, --license show license\n" | 44 | " -L, --license show license\n" |
43 | " -p <port>, --port=<port> port to listen to\n" | 45 | " -p <port>, --port=<port> port to listen to\n" |
44 | " (you're not likely to ever need it)\n" | 46 | " (you're not likely to ever need it)\n" |
47 | " -d, --daemon run as daemon\n" | ||
45 | << std::endl << std::endl; | 48 | << std::endl << std::endl; |
46 | exit(0); | 49 | exit(0); |
47 | break; | 50 | break; |
48 | case 'V': | 51 | case 'V': |
49 | std::cerr << VERSION << std::endl; | 52 | std::cerr << VERSION << std::endl; |
50 | exit(0); | 53 | exit(0); |
51 | break; | 54 | break; |
52 | case 'L': | 55 | case 'L': |
@@ -56,40 +59,79 @@ int main(int argc,char **argv) try { | |||
56 | break; | 59 | break; |
57 | case 'p': | 60 | case 'p': |
58 | port = 0xffff&strtol(optarg,0,0); | 61 | port = 0xffff&strtol(optarg,0,0); |
59 | if(errno) { | 62 | if(errno) { |
60 | std::cerr << "Failed to parse port number" << std::endl; | 63 | std::cerr << "Failed to parse port number" << std::endl; |
61 | exit(1); | 64 | exit(1); |
62 | } | 65 | } |
63 | break; | 66 | break; |
67 | case 'd': | ||
68 | daemon_mode = true; | ||
69 | break; | ||
64 | default: | 70 | default: |
65 | std::cerr << "Huh?" << std::endl; | 71 | std::cerr << "Huh?" << std::endl; |
66 | exit(1); | 72 | exit(1); |
67 | break; | 73 | break; |
68 | } | 74 | } |
69 | } | 75 | } |
70 | 76 | ||
71 | const char *ident = rindex(*argv,'/'); | 77 | const char *ident = rindex(*argv,'/'); |
72 | if(ident) | 78 | if(ident) |
73 | ++ident; | 79 | ++ident; |
74 | else | 80 | else |
75 | ident = *argv; | 81 | ident = *argv; |
76 | openlog(ident,LOG_PERROR|LOG_PID,LOG_DAEMON); | 82 | openlog(ident,LOG_PERROR|LOG_PID,LOG_DAEMON); |
77 | syslog(LOG_INFO,"Starting iii eye-fi manager"); | 83 | syslog(LOG_INFO,"Starting iii eye-fi manager on port %d", port); |
78 | 84 | ||
79 | struct stat st; | 85 | struct stat st; |
80 | if(stat(EYEKIN_CONF_DIR,&st) || !S_ISDIR(st.st_mode)) | 86 | 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); | 87 | 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); | 88 | glob_t g; int rg = glob(EYEKIN_CONF_DIR"/????????????.conf",GLOB_NOSORT,NULL,&g); |
83 | if(rg || !g.gl_pathc) | 89 | if(rg || !g.gl_pathc) |
84 | syslog(LOG_WARNING,"I see nothing resembling a card config in '%s'",EYEKIN_CONF_DIR); | 90 | syslog(LOG_WARNING,"I see nothing resembling a card config in '%s'",EYEKIN_CONF_DIR); |
85 | else | 91 | else |
86 | globfree(&g); | 92 | globfree(&g); |
87 | 93 | ||
94 | if(daemon_mode){ | ||
95 | pid_t pid, sid; | ||
96 | |||
97 | /* Fork off the parent process */ | ||
98 | pid = fork(); | ||
99 | if (pid < 0) { | ||
100 | exit(EXIT_FAILURE); | ||
101 | } | ||
102 | /* If we got a good PID, then | ||
103 | we can exit the parent process. */ | ||
104 | if (pid > 0) { | ||
105 | exit(EXIT_SUCCESS); | ||
106 | } | ||
107 | |||
108 | /* Change the file mode mask */ | ||
109 | umask(0); | ||
110 | |||
111 | /* Create a new SID for the child process */ | ||
112 | sid = setsid(); | ||
113 | if (sid < 0) { | ||
114 | syslog(LOG_ERR, "Error creating a new SID for the child process"); | ||
115 | exit(EXIT_FAILURE); | ||
116 | } | ||
117 | |||
118 | /* Change the current working directory */ | ||
119 | if ((chdir("/")) < 0) { | ||
120 | syslog(LOG_ERR, "Error changing current working directory to /"); | ||
121 | exit(EXIT_FAILURE); | ||
122 | } | ||
123 | |||
124 | /* Close out the standard file descriptors */ | ||
125 | close(STDIN_FILENO); | ||
126 | close(STDOUT_FILENO); | ||
127 | close(STDERR_FILENO); | ||
128 | } | ||
129 | |||
88 | eyefiworker().run(port); | 130 | eyefiworker().run(port); |
89 | 131 | ||
90 | closelog(); | 132 | closelog(); |
91 | return 0; | 133 | return 0; |
92 | } catch(const throwable_exit& e) { | 134 | } catch(const throwable_exit& e) { |
93 | return e.rc; | 135 | return e.rc; |
94 | } catch(const std::exception& e) { | 136 | } catch(const std::exception& e) { |
95 | syslog(LOG_CRIT,"Exiting iii daemon, because of error condition"); | 137 | syslog(LOG_CRIT,"Exiting iii daemon, because of error condition"); |