--- mqtt/src/mqttd.c	2012/07/03 12:46:00	1.4
+++ mqtt/src/mqttd.c	2017/10/08 22:49:25	1.5
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: mqttd.c,v 1.4 2012/07/03 12:46:00 misho Exp $
+* $Id: mqttd.c,v 1.5 2017/10/08 22:49:25 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -50,8 +50,6 @@ SUCH DAMAGE.
 #include "daemon.h"
 
 
-io_enableDEBUG;
-
 cfg_root_t cfg;
 sessions_t Sessions;
 sched_root_task_t *root;
@@ -83,14 +81,14 @@ sigHand(int sig)
 		case SIGHUP:
 			cfgUnloadConfig(&cfg);
 			if (!cfgLoadConfig(szCfgName, &cfg)) {
-				ioDEBUG(1, "Config reload OK!");
+				EVERBOSE(1, "Config reload OK!");
 				break;
 			}
 
-			ioLIBERR(cfg);
+			ELIBERR(cfg);
 		case SIGINT:
 		case SIGTERM:
-			ioDEBUG(1, "Terminate MQTT service in progress");
+			EVERBOSE(1, "Terminate MQTT service in progress");
 			Kill++;
 			break;
 		case SIGCHLD:
@@ -124,7 +122,8 @@ main(int argc, char **argv)
 				batch++;
 				break;
 			case 'v':
-				io_incDebug;
+				e_incVerbose;
+				EVERBS(2) elwix_Debug |= ELWIX_DEBUG_TRACE;
 				break;
 			case 'h':
 			default:
@@ -189,16 +188,16 @@ main(int argc, char **argv)
 					dup2(ret, STDERR_FILENO);
 					close(ret);
 				}
-				ioDEBUG(2, "Welcome MQTT service into shadow land!");
+				EVERBOSE(2, "Welcome MQTT service into shadow land!");
 				break;
 			default:
-				ioDEBUG(2, "MQTT service go to shadow land ...");
+				EVERBOSE(2, "MQTT service go to shadow land ...");
 				sleep(1);
 				ret = 0;
 				goto end;
 		}
 	else
-		ioDEBUG(1, "Start service in batch mode ...");
+		EVERBOSE(1, "Start service in batch mode ...");
 
 	memset(&sa, 0, sizeof sa);
 	sigemptyset(&sa.sa_mask);
@@ -208,7 +207,7 @@ main(int argc, char **argv)
 	sigaction(SIGTERM, &sa, NULL);
 	sigaction(SIGCHLD, &sa, NULL);
 	sigaction(SIGPIPE, &sa, NULL);
-	ioDEBUG(2, "Service is ready for starting engine ...");
+	EVERBOSE(2, "Service is ready for starting engine ...");
 
 	if ((sock = srv_Socket(&cfg)) == -1) {
 		ret = 4;
@@ -221,11 +220,11 @@ main(int argc, char **argv)
 	if (pass) {
 		setgid(pass->pw_gid);
 		setuid(pass->pw_uid);
-		ioDEBUG(2, "Try to change group #%d and user #%d", pass->pw_gid, pass->pw_uid);
+		EVERBOSE(2, "Try to change group #%d and user #%d", pass->pw_gid, pass->pw_uid);
 	}
 
 	if (!(root = schedBegin())) {
-		ioLIBERR(sched);
+		ELIBERR(sched);
 		ret = 6;
 		goto end;
 	}