mbsePi-apps: comparison thermometers/main.c

-:f78f313b1d34
+:102c44bb8c9d
 static int		last_mid = -1;
 static int		last_mid_sent = -1;
 static bool		connected = true;
 static bool		disconnect_sent = false;
 static bool		shutdown = false;
+static pid_t		pgrp, mypid;
 extern bool		debug;
 extern sys_config	Config;
 int server(void);
 void die(int);
 void help(void)
 {
+fprintf(stdout, "mbsePi-apps thermometers v%s starting\n\n", VERSION);
 fprintf(stdout, "Usage: thermomeneters [-d] [-h]\n");
-fprintf(stdout, "  -d --debug              Debug on\n");
+fprintf(stdout, "  -d --debug              Debug and run in foreground\n");
 fprintf(stdout, "  -h --help               Display this help\n");
 }
 int main(int argc, char *argv[])
 {
-int rc, c, i;
+int		rc, c, i;
+pid_t	frk;
 while (1) {
 	int option_index = 0;
 	static struct option long_options[] = {
 	    {"debug", 0, 0, 'c'},
 	}
 }
 openlog("thermometers", LOG_PID|LOG_CONS|LOG_NOWAIT, LOG_USER);
 syslog(LOG_NOTICE, "mbsePi-apps thermometers v%s starting", VERSION);
+if (debug)
+	fprintf(stdout, "mbsePi-apps thermometers v%s starting\n", VERSION);
 if (rdconfig()) {
 	fprintf(stderr, "Error reading configuration\n");
 	syslog(LOG_NOTICE, "halted");
 	return 1;
 for (i = 0; i < NSIG; i++) {
 	if ((i != SIGCHLD) && (i != SIGKILL) && (i != SIGSTOP))
 	    signal(i, (void (*))die);
 }
-rc = server();
+if (debug) {
+	/*
+	 * For debugging run in foreground.
+	 */
+	rc = server();
+} else {
+	/*
+	 * Server initialization is complete. Now we can fork the
+	 * daemon and return to the user. We need to do a setpgrp
+	 * so that the daemon will no longer be assosiated with the
+	 * users control terminal. This is done before the fork, so
+	 * that the child will not be a process group leader. Otherwise,
+	 * if the child were to open a terminal, it would become
+	 * associated with that terminal as its control terminal.
+	 */
+	if ((pgrp = setpgid(0, 0)) == -1) {
+	    syslog(LOG_NOTICE, "setpgpid failed");
+	}
+	frk = fork();
+	switch (frk) {
+	    case -1:
+		    	syslog(LOG_NOTICE, "Daemon fork failed: %s", strerror(errno));
+			syslog(LOG_NOTICE, "Finished, rc=1");
+			exit(1);
+	    case 0:	/*
+			 * Run the daemon
+			 */
+			fclose(stdin);
+			if (open("/dev/null", O_RDONLY) != 0) {
+			    syslog(LOG_NOTICE, "Reopen of stdin to /dev/null failed");
+			    _exit(2);
+			}
+			fclose(stdout);
+			if (open("/dev/null", O_WRONLY | O_APPEND | O_CREAT,0600) != 1) {
+			    syslog(LOG_NOTICE, "Reopen of stdout to /dev/null failed");
+			    _exit(2);
+			}
+			fclose(stderr);
+			if (open("/dev/null", O_WRONLY | O_APPEND | O_CREAT,0600) != 2) {
+			    syslog(LOG_NOTICE, "Reopen of stderr to /dev/null failed");
+			    _exit(2);
+			}
+			mypid = getpid();
+			rc = server();
+			break;
+			/* Not reached */
+	    default:
+			/*
+			 * Here we detach this process and let the child
+			 * run the deamon process.
+			 */
+			syslog(LOG_NOTICE, "Starting daemon with pid %d", frk);
+			exit(0);
+	}
+}
 syslog(LOG_NOTICE, "Finished, rc=%d", rc);
 return rc;
 }
 */
 state = xstrcpy((char *)"clients/");
 state = xstrcat(state, hostname);
 state = xstrcat(state, (char *)"/thermometers/state");
 sprintf(buf, "0");
+if ((rc = mosquitto_will_set(mosq, state, strlen(buf), buf, qos, true))) {
-rc = mosquitto_will_set(mosq, state, strlen(buf), buf, qos, true);
-if (rc) {
 if (rc == MOSQ_ERR_INVAL) {
 syslog(LOG_NOTICE, "mosquitto_will_set: input parameters invalid");
 } else if (rc == MOSQ_ERR_NOMEM) {
 syslog(LOG_NOTICE, "mosquitto_will_set: Out of Memory");
 	} else if (rc == MOSQ_ERR_PAYLOAD_SIZE) {
 mosquitto_max_inflight_messages_set(mosq, max_inflight);
 mosquitto_connect_callback_set(mosq, my_connect_callback);
 mosquitto_disconnect_callback_set(mosq, my_disconnect_callback);
 mosquitto_publish_callback_set(mosq, my_publish_callback);
-rc = mosquitto_connect(mosq, Config.mosq_host, Config.mosq_port, keepalive);
+if ((rc = mosquitto_connect(mosq, Config.mosq_host, Config.mosq_port, keepalive))) {
-if (rc) {
 	if (rc == MOSQ_ERR_ERRNO) {
 	    strerror_r(errno, err, 1024);
 	    syslog(LOG_NOTICE, "mosquitto_connect: error: %s", err);
 	} else {
 	    syslog(LOG_NOTICE, "mosquitto_connect: unable to connect (%d)", rc);
 */
 mosquitto_loop_start(mosq);
 sprintf(buf, "1");
 rc = mosquitto_publish(mosq, &mid_sent, state, strlen(buf), buf, qos, 1);
-fprintf(stdout, (char *)"Enter loop, connected %d\n", connected);
+if (debug)
+	fprintf(stdout, (char *)"Enter loop, connected %d\n", connected);
 do {
 	if (status == STATUS_CONNACK_RECVD) {
 	    /*
-	     * Here send our sensors values
+	     * Here send our 1-wire sensors values
 	     */
 	    for (tmp1 = Config.w1therms; tmp1; tmp1 = old1) {
 		old1 = tmp1->next;
 		/*
 		    }
 		    fclose(fp);
 		    tmp1->present = 1;
 		} else {
 		    tmp1->present = 0;
-		    printf("sensor %s is missing\n", tmp1->name);
+		    if (debug)
+		    	printf("sensor %s is missing\n", tmp1->name);
 		}
 		free(device);
 		device = NULL;
 		free(alias);
 		mosquitto_publish(mosq, &mid_sent, state, strlen(buf), buf, qos, true);
 		last_mid = mid_sent;
 		status = STATUS_WAITING;
 	    }
 	} else if (status == STATUS_WAITING) {
-	    fprintf(stdout, (char *)"Waiting\n");
+	    if (debug)
+	    	fprintf(stdout, (char *)"Waiting\n");
 	    if (last_mid_sent == last_mid && disconnect_sent == false) {
 		mosquitto_disconnect(mosq);
 		disconnect_sent = true;
 	    }
 	    usleep(100000);
 	}
 	rc = MOSQ_ERR_SUCCESS;
-} while(rc == MOSQ_ERR_SUCCESS && connected);
+} while (rc == MOSQ_ERR_SUCCESS && connected);
-fprintf(stdout, (char *)"Out of loop\n");
+if (debug)
+	fprintf(stdout, (char *)"Out of loop\n");
 mosquitto_loop_stop(mosq, false);
 mosquitto_destroy(mosq);
 mosquitto_lib_cleanup();
-return 0;
+return rc;
 }

Mercurial > mbsePi-apps / file comparison

comparison: thermometers/main.c

thermometers/main.c