Minor changes

5 files changed, 23 insertions, 25 deletions

diff --git a/src/ban.c b/src/ban.c
index a50b5a3..02ae979 100644
--- a/src/ban.c
+++ b/src/ban.c
@@ -1,3 +1,3 @@
 /* This file is part of varnish-mib -*- c -*-
-   Copyright (C) 2014-2018 Sergey Poznyakoff
+   Copyright (C) 2014-2019 Sergey Poznyakoff
 
@@ -53,3 +53,3 @@ varnish_ban(netsnmp_agent_request_info   *reqinfo,
 	expr[len] = 0;
-	DEBUGMSGTL(("varnish_mib:ban", "setting ban %s\n", expr));
+	DEBUGMSGTL(("ban", "setting ban %s\n", expr));
 	rc = vcli_connect(vsm, &conn);
@@ -121,3 +121,3 @@ banTable_load(netsnmp_cache *cache, void *vmagic)
 	
-	DEBUGMSGTL(("varnish_mib:ban", "reloading ban table\n"));
+	DEBUGMSGTL(("ban", "reloading ban table\n"));
 	rc = vcli_connect(vsm, &conn);
@@ -231,3 +231,3 @@ banTable_load(netsnmp_cache *cache, void *vmagic)
 	vcli_disconnect(&conn);
-	DEBUGMSGTL(("varnish_mib:ban", "loaded %ld ban entries\n", idx));
+	DEBUGMSGTL(("ban", "loaded %ld ban entries\n", idx));
 	return 0;
@@ -241,3 +241,3 @@ banTable_free(netsnmp_cache *cache, void *vmagic)
 
-	DEBUGMSGTL(("varnish_mib:ban", "freeing ban table\n"));
+	DEBUGMSGTL(("ban", "freeing ban table\n"));
 	while ((row = netsnmp_tdata_row_first(table))) {
diff --git a/src/betab.c b/src/betab.c
index 768503a..c472b9d 100644
--- a/src/betab.c
+++ b/src/betab.c
@@ -1,3 +1,3 @@
 /* This file is part of varnish-mib
-   Copyright (C) 2014, 2018 Sergey Poznyakoff
+   Copyright (C) 2014-2019 Sergey Poznyakoff
 
@@ -138,3 +138,3 @@ backendTable_load(netsnmp_cache *cache, void *vmagic)
 
-	DEBUGMSGTL(("varnish_mib:backend", "loading backend table\n"));
+	DEBUGMSGTL(("backend", "loading backend table\n"));
 
@@ -184,3 +184,3 @@ backendTable_free(netsnmp_cache *cache, void *vmagic)
 
-	DEBUGMSGTL(("varnish_mib:backend", "freeing backend table\n"));
+	DEBUGMSGTL(("backend", "freeing backend table\n"));
 	while ((row = netsnmp_tdata_row_first(table))) {
@@ -336,3 +336,3 @@ backend_collect_addr(struct vsm *vsm)
 	
-	DEBUGMSGTL(("varnish_mib:backend", "getting backend info\n"));
+	DEBUGMSGTL(("backend", "getting backend info\n"));
 	
diff --git a/src/main.c b/src/main.c
index a8d089f..01a24a9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -163,2 +163,5 @@ main(int argc, char **argv)
 			       NETSNMP_DS_AGENT_ROLE, 1);
+	if (!log_set)
+		snmp_enable_stderrlog();
+	
 	SOCK_STARTUP;
@@ -184,5 +187,2 @@ main(int argc, char **argv)
 		}
-	} else {
-		if (!log_set)
-			snmp_enable_stderrlog();
 	}
diff --git a/src/varnish-mib.8 b/src/varnish-mib.8
index 0856c69..3dc28d8 100644
--- a/src/varnish-mib.8
+++ b/src/varnish-mib.8
@@ -122,6 +122,6 @@ Produces general debugging information.
 .TP
-.B varnish_mib:ban
+.B ban
 Outputs verbose report about loading th ban table.
 .TP
-.B varnish_mib:vcli
+.B vcli
 Displays additional information regarding varnish
@@ -130,6 +130,6 @@ interaction.
 .TP
-.B varnish_mib:vcli:transcript
+.B vcli:transcript
 Enables full transcript of varnish CLI session.
 .TP
-.B varnish_mib:backend
+.B backend
 Outputs verbose information about loading the backend information.
diff --git a/src/vcli.c b/src/vcli.c
index 94f0eef..8669446 100644
--- a/src/vcli.c
+++ b/src/vcli.c
@@ -1,3 +1,3 @@
 /* This file is part of varnish-mib -*- c -*-
-   Copyright (C) 2014-2018 Sergey Poznyakoff
+   Copyright (C) 2014-2019 Sergey Poznyakoff
 
@@ -201,3 +201,3 @@ vcli_read(struct vcli_conn *conn, size_t size)
 		conn->base[conn->bufsize] = 0;
-		DEBUGMSGTL(("varnish_mib:vcli:transcript", "<<varnish: %s\n", conn->base));
+		DEBUGMSGTL(("vcli:transcript", "<<varnish: %s\n", conn->base));
 	}
@@ -284,3 +284,3 @@ vcli_write(struct vcli_conn *conn)
 
-	DEBUGMSGTL(("varnish_mib:vcli:transcript", ">>varnish: %s\n", conn->base));
+	DEBUGMSGTL(("vcli:transcript", ">>varnish: %s\n", conn->base));
 	for (size = 0; size < conn->bufsize; ) {
@@ -492,4 +492,3 @@ parse_connection(struct vsm *vsm, vcli_sockaddr_t *addr, char **secret)
 	if (vcli_sockaddr) {
-		DEBUGMSGTL(("varnish_mib:vcli",
-			    "using configured sockaddr\n"));
+		DEBUGMSGTL(("vcli", "using configured sockaddr\n"));
 		*addr = vcli_sockaddr_dup(vcli_sockaddr);
@@ -505,3 +504,3 @@ parse_connection(struct vsm *vsm, vcli_sockaddr_t *addr, char **secret)
 			*p = 0;
-		DEBUGMSGTL(("varnish_mib:vcli", "-T '%s'\n", T_arg));
+		DEBUGMSGTL(("vcli", "-T '%s'\n", T_arg));
 		*addr = vcli_parse_sockaddr(T_arg);
@@ -513,4 +512,3 @@ parse_connection(struct vsm *vsm, vcli_sockaddr_t *addr, char **secret)
 	if (vcli_secret) {
-		DEBUGMSGTL(("varnish_mib:vcli",
-			    "using configured secret\n"));
+		DEBUGMSGTL(("vcli", "using configured secret\n"));
 		*secret = strdup(vcli_secret);
@@ -526,3 +524,3 @@ parse_connection(struct vsm *vsm, vcli_sockaddr_t *addr, char **secret)
 		}
-		DEBUGMSGTL(("varnish_mib:vcli", "-S '%s'\n", S_arg));
+		DEBUGMSGTL(("vcli", "-S '%s'\n", S_arg));
 		*secret = S_arg;