summaryrefslogtreecommitdiffabout
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
parentf924f4f199f289a18b642de632ec69558f3af3f9 (diff)
parentfdc2ed23c5c92cb38ab446b510056da01c7f3e12 (diff)
downloadiii-master.zip
iii-master.tar.gz
iii-master.tar.bz2
Merge pull request #2 from older/masterHEADmaster
Add command line option to daemonize iiid process
Diffstat (more/less context) (show 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
@@ -21,2 +21,3 @@ int main(int argc,char **argv) try {
21 int port = 59278; 21 int port = 59278;
22 bool daemon_mode = false;
22 23
@@ -29,5 +30,6 @@ int main(int argc,char **argv) try {
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;
@@ -44,2 +46,3 @@ int main(int argc,char **argv) try {
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;
@@ -63,2 +66,5 @@ int main(int argc,char **argv) try {
63 break; 66 break;
67 case 'd':
68 daemon_mode = true;
69 break;
64 default: 70 default:
@@ -76,3 +82,3 @@ int main(int argc,char **argv) try {
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
@@ -87,2 +93,36 @@ int main(int argc,char **argv) try {
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);