remove "daemon" setting, add foreground option

etc/vzlogger.conf

@@ -12,7 +12,6 @@
 
 {
     // General settings
-    "daemon": false,        // run periodically
     "verbosity": 5,         // log verbosity (0=log_alert, 1=log_error, 3=log_warning, 5=log_info, 10=log_debug, 15=log_finest)
     "log": "/var/log/vzlogger.log", // log file, optional
     "retry": 30,            // http retry delay in seconds

etc/vzlogger_generic.schema.json

@@ -1036,12 +1036,6 @@
             "type": "integer",
             "description": "How long to sleep between failed requests, in seconds"
         },
-        "daemon": {
-            "id": "/daemon",
-            "type": "boolean",
-            "default": "true",
-            "description": "Enable daemon mode"
-        },
         "verbosity": {
             "id": "/verbosity",
             "type": "integer",
@@ -1066,7 +1060,6 @@
         }
     },
     "required": [
-        "daemon",
         "log"
     ]
 }

include/Config_Options.hpp

@@ -74,9 +74,8 @@ class Config_Options {
 	int retry_pause() const { return _retry_pause; }
 
 	bool channel_index() const { return _channel_index; }
-	bool daemon() const { return _daemon; }
 	bool local() const { return _local; }
-	bool logging() const { return _logging; }
+	bool foreground() const { return _foreground; }
 
 	bool doRegistration() const { return _doRegistration; }
 
@@ -90,9 +89,9 @@ class Config_Options {
 			_verbosity = v;
 	}
 
-	void daemon(const bool v) { _daemon = v; }
 	void local(const bool v) { _local = v; }
-	void logging(const bool v) { _logging = v; }
+
+	void foreground(const bool v) { _foreground = v; }
 
 	void doRegistration(const bool v) { _doRegistration = v; }
 
@@ -112,10 +111,9 @@ class Config_Options {
 
 	// boolean bitfields, padding at the end of struct
 	int _channel_index : 1;  // give a index of all available channels via local interface
-	int _daemon : 1;         // run in background
 	int _local : 1;          // enable local interface
-	int _logging : 1;        // start logging threads, depends on local & daemon
-	int _doRegistration : 1; // start logging threads, depends on local & daemon
+	int _foreground : 1;	 // don't daemonize
+	int _doRegistration : 1; // FIXME
 };
 
 /**

src/Channel.cpp

@@ -90,7 +90,7 @@ Channel::Channel(const std::list<Option> &pOptions, const std::string apiProtoco
 }
 
 /**
- * Free all allocated memory recursivly
+ * Free all allocated memory recursively
  */
 Channel::~Channel() {
 	// this hangs is the readingthread was pthread_cancelled during wait!

src/Config_Options.cpp

@@ -41,14 +41,13 @@ static const char *option_type_str[] = {"null",   "boolean", "double", "int",
 
 Config_Options::Config_Options()
 	: _config("/etc/vzlogger.conf"), _log(""), _pds(0), _port(8080), _verbosity(0),
-	  _comet_timeout(30), _buffer_length(-1), _retry_pause(15), _daemon(false), _local(false),
-	  _logging(true) {
+	  _comet_timeout(30), _buffer_length(-1), _retry_pause(15), _local(false), _foreground(false) {
 	_logfd = NULL;
 }
 
 Config_Options::Config_Options(const std::string filename)
 	: _config(filename), _log(""), _pds(0), _port(8080), _verbosity(0), _comet_timeout(30),
-	  _buffer_length(-1), _retry_pause(15), _daemon(false), _local(false), _logging(true) {
+	  _buffer_length(-1), _retry_pause(15), _local(false), _foreground(false) {
 	_logfd = NULL;
 }
 
@@ -118,7 +117,10 @@ void Config_Options::config_parse(MapContainer &mappings) {
 			enum json_type type = json_object_get_type(value);
 
 			if (strcmp(key, "daemon") == 0 && type == json_type_boolean) {
-				_daemon = json_object_get_boolean(value);
+				if (!json_object_get_boolean(value)) {
+					throw vz::VZException("\"daemon\" option is not supported anymore, "
+										  "you probably want to use -f instead.");
+				}
 			} else if (strcmp(key, "log") == 0 && type == json_type_string) {
 				_log = json_object_get_string(value);
 			} else if (strcmp(key, "retry") == 0 && type == json_type_int) {
@@ -267,7 +269,7 @@ void Config_Options::config_parse_channel(Json &jso, MeterMap &mapping) {
 	}
 	// check if identifier is set. If not, use default
 	if (id_str == NULL) {
-		print(log_error, "Identifier is not set. Set it to default value 'NilIdentifier'.", NULL);
+		print(log_error, "Identifier is not set. Using default value 'NilIdentifier'.", NULL);
 		id_str = "NilIdentifier";
 	}
 	// if (middleware == NULL) {

src/Meter.cpp

@@ -201,7 +201,7 @@ Meter::Meter(std::list<Option> pOptions) : _name("meter") {
 		// enable
 		_enable = optlist.lookup_bool(pOptions, "enabled");
 	} catch (vz::OptionNotFoundException &e) {
-		_enable = false; /* bye default meter is disabled */
+		_enable = false; /* by default meter is disabled */
 	} catch (vz::VZException &e) {
 		print(log_alert, "Invalid type for enable", name());
 		throw;

src/MeterMap.cpp

@@ -77,7 +77,7 @@ void MeterMap::start() {
 	}
 }
 
-void MeterMap::cancel() { // get's called from MapContainer::quit that get's called from sigint
+void MeterMap::cancel() { // is called from MapContainer::quit which is called from sigint handler
 						  // handler ::quit
 	print(log_finest, "MeterMap::cancel entered...", _meter->name());
 	if (_meter->isEnabled() && running()) {
@@ -115,7 +115,7 @@ void MeterMap::registration() {
 			print(log_debug, "Using InfluxDB api", (*ch)->name());
 		} else if (0 == strcasecmp((*ch)->apiProtocol().c_str(), "null")) {
 			api = vz::ApiIF::Ptr(new vz::api::Null(*ch, (*ch)->options()));
-			print(log_debug, "Using null api- meter data available via local httpd if enabled.",
+			print(log_debug, "Using null api - meter data available via local httpd if enabled.",
 				  (*ch)->name());
 		} else {
 			if (strcasecmp((*ch)->apiProtocol().c_str(), "volkszaehler"))

src/api/InfluxDB.cpp

@@ -254,7 +254,7 @@ void vz::api::InfluxDB::send() {
 
 	print(log_debug, "Buffer has %i items", channel()->name(), buf->size());
 
-	// delete items if the buffer gets too big
+	// delete items if the buffer grows too large
 	if (buf->size() > (unsigned)_max_buffer_size) {
 		print(log_warning,
 			  "Buffer too big (%i items). Deleting items. (This indicates a connection problem)",

src/api/MySmartGrid.cpp

@@ -206,7 +206,7 @@ void vz::api::MySmartGrid::send() {
 	/* householding */
 	json_object_put(json_obj);
 
-	if (options.daemon() && (curl_code != CURLE_OK || http_code != 200)) {
+	if ((curl_code != CURLE_OK || http_code != 200)) {
 		print(log_info, "Waiting %i secs for next request due to previous failure",
 			  channel()->name(), options.retry_pause());
 		sleep(options.retry_pause());
@@ -299,7 +299,7 @@ void vz::api::MySmartGrid::_send(const std::string &url, json_object *json_obj)
 	/* householding */
 	json_object_put(json_obj);
 
-	if (options.daemon() && (curl_code != CURLE_OK || http_code != 200)) {
+	if ((curl_code != CURLE_OK || http_code != 200)) {
 		print(log_info, "Waiting %i secs for next request due to previous failure",
 			  channel()->name(), options.retry_pause());
 		sleep(options.retry_pause());

src/api/Volkszaehler.cpp

@@ -171,7 +171,7 @@ void vz::api::Volkszaehler::send() {
 	free(response.data);
 	json_object_put(json_obj);
 
-	if (options.daemon() && (curl_code != CURLE_OK || http_code != 200)) {
+	if ((curl_code != CURLE_OK || http_code != 200)) {
 		print(log_info, "Waiting %i secs for next request due to previous failure",
 			  channel()->name(), options.retry_pause());
 		sleep(options.retry_pause());

src/protocols/MeterS0.cpp

@@ -192,8 +192,8 @@ void timespec_add_ms(struct timespec &a, unsigned long ms) {
 }
 
 void MeterS0::check_ref_for_overflow() {
-	// check whether _ms_last_impulse get's too long
-	// and has risk for overflow (roughly once a month with 32bit unsigned long)
+	// protect against _ms_last_impulse overflwing,
+	// it would overflow roughly once a month with 32bit unsigned long
 
 	if (_ms_last_impulse > (1ul << 30)) {
 		// now we enter a race condition so there might be wrong impulse now!

src/threads.cpp

@@ -56,7 +56,6 @@ void *reading_thread(void *arg) {
 	;
 
 	print(log_debug, "Number of readers: %d", mtr->name(), details->max_readings);
-	print(log_debug, "Config.daemon: %d", mtr->name(), options.daemon());
 	print(log_debug, "Config.local: %d", mtr->name(), options.local());
 
 	try {
@@ -171,7 +170,7 @@ void *reading_thread(void *arg) {
 				print(log_info, "Next reading in %i seconds", mtr->name(), mtr->interval());
 				sleep(mtr->interval());
 			}
-		} while (options.daemon() || options.local());
+		} while (true);
 	} catch (std::exception &e) {
 		std::stringstream oss;
 		oss << e.what();
@@ -185,14 +184,13 @@ void *reading_thread(void *arg) {
 	return NULL;
 }
 
-void *logging_thread(void *arg) { // get's started from Channel::start and stopped via
+void *logging_thread(void *arg) { // is started by Channel::start and stopped via
 								  // Channel::cancel via pthread_cancel!
 	Channel *__this =
 		static_cast<Channel *>(arg);           // retrieve the pointer to the corresponding Channel
 	Channel::Ptr ch = __this->_this_forthread; // And get a copy of the Channel owner's shared_ptr
 											   // for passing it on.
-	print(log_debug, "Start logging thread for %s-api. Running as daemon: %s", ch->name(),
-		  ch->apiProtocol().c_str(), options.daemon() ? "yes" : "no");
+	print(log_debug, "Start logging thread for %s-api.", ch->name(), ch->apiProtocol().c_str());
 
 	// create configured api interfaces
 	// NOTE: if additional APIs are introduced both threads.cpp and MeterMap.cpp need to be updated
@@ -228,7 +226,7 @@ void *logging_thread(void *arg) { // get's started from Channel::start and stopp
 
 	} while (true); // endless?!
 
-	print(log_debug, "Stopped logging. (daemon=%d)", ch->name(), options.daemon());
+	print(log_debug, "Stopped logging.", ch->name());
 	pthread_exit(0);
 
 	return NULL;

src/vzlogger.cpp

@@ -75,7 +75,7 @@ std::mutex
 const struct option long_options[] = {
 	{"config", required_argument, 0, 'c'},
 	{"log", required_argument, 0, 'o'},
-	{"daemon", required_argument, 0, 'd'},
+	{"foreground", no_argument, 0, 'f'},
 #ifdef LOCAL_SUPPORT
 	{"httpd", no_argument, 0, 'l'},
 	{"httpd-port", required_argument, 0, 'p'},
@@ -93,7 +93,7 @@ const struct option long_options[] = {
 const char *long_options_descs[] = {
 	"configuration file",
 	"log file",
-	"run in background",
+	"run in foreground, do not daemonize",
 #ifdef LOCAL_SUPPORT
 	"activate local interface (tiny HTTPd which serves live readings)",
 	"TCP port for HTTPd",
@@ -285,7 +285,7 @@ void signalHandlerQuit(int sig) {
  */
 int config_parse_cli(int argc, char *argv[], Config_Options *options) {
 	while (1) {
-		int c = getopt_long(argc, argv, "c:o:p:lhrVdfv:", long_options, NULL);
+		int c = getopt_long(argc, argv, "c:o:p:lhrVfv:", long_options, NULL);
 
 		/* detect the end of the options. */
 		if (c == -1)
@@ -306,8 +306,8 @@ int config_parse_cli(int argc, char *argv[], Config_Options *options) {
 			break;
 #endif /* LOCAL_SUPPORT */
 
-		case 'd':
-			options->daemon(1);
+		case 'f':
+			options->foreground(1);
 			break;
 
 		case 'c': /* config file */
@@ -425,13 +425,13 @@ int main(int argc, char *argv[]) {
 		return (0);
 	}
 
-	print(log_debug, "daemon=%d, local=%d", "main", options.daemon(), options.local());
+	print(log_debug, "local=%d", "main", options.local());
 
-	if (options.daemon()) {
+	if (!options.foreground()) {
 		print(log_info, "Daemonize process...", (char *)0);
 		daemonize();
 	} else {
-		print(log_info, "Process not  daemonized...", (char *)0);
+		print(log_info, "Process not daemonized...", (char *)0);
 	}
 
 	/* open logfile */