summaryrefslogtreecommitdiffabout
path: root/src
authorMichael Krelin <hacker@klever.net>2014-02-14 21:25:33 (UTC)
committer Michael Krelin <hacker@klever.net>2014-02-14 21:25:33 (UTC)
commit0f6efc26f6331bacf76c76ef1376d3cc6e450418 (patch) (unidiff)
tree7609c1cdd0617547cf2c7bf0764ca0d0e33106d3 /src
parentf924f4f199f289a18b642de632ec69558f3af3f9 (diff)
parentfdc2ed23c5c92cb38ab446b510056da01c7f3e12 (diff)
downloadiii-0f6efc26f6331bacf76c76ef1376d3cc6e450418.zip
iii-0f6efc26f6331bacf76c76ef1376d3cc6e450418.tar.gz
iii-0f6efc26f6331bacf76c76ef1376d3cc6e450418.tar.bz2
Merge pull request #2 from older/masterHEADmaster
Add command line option to daemonize iiid process
Diffstat (limited to 'src') (more/less context) (ignore whitespace changes)
-rw-r--r--src/iiid.cc44
1 files changed, 42 insertions, 2 deletions
diff --git a/src/iiid.cc b/src/iiid.cc
index b3dd3bf..29acd06 100644
--- a/src/iiid.cc
+++ b/src/iiid.cc
@@ -19,6 +19,7 @@
19int main(int argc,char **argv) try { 19int 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[] = {
@@ -27,9 +28,10 @@ int main(int argc,char **argv) try {
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':
@@ -42,6 +44,7 @@ int main(int argc,char **argv) try {
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;
@@ -61,6 +64,9 @@ int main(int argc,char **argv) try {
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);
@@ -74,7 +80,7 @@ int main(int argc,char **argv) try {
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))
@@ -85,6 +91,40 @@ int main(int argc,char **argv) try {
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 syslog(LOG_ERR, "Error forking the parent process");
101 exit(EXIT_FAILURE);
102 }
103
104 /* If we got a good PID, then we can exit the parent process. */
105 if (pid > 0) {
106 exit(EXIT_SUCCESS);
107 }
108
109 /* Create a new SID for the child process */
110 sid = setsid();
111 if (sid < 0) {
112 syslog(LOG_ERR, "Error creating a new SID for the child process");
113 exit(EXIT_FAILURE);
114 }
115
116 /* Change the current working directory */
117 if ((chdir("/")) < 0) {
118 syslog(LOG_ERR, "Error changing current working directory to /");
119 exit(EXIT_FAILURE);
120 }
121
122 /* Close out the standard file descriptors */
123 close(STDIN_FILENO);
124 close(STDOUT_FILENO);
125 close(STDERR_FILENO);
126 }
127
88 eyefiworker().run(port); 128 eyefiworker().run(port);
89 129
90 closelog(); 130 closelog();