aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2019-02-14 12:07:17 +0200
committerSergey Poznyakoff <gray@gnu.org>2019-02-14 12:07:17 +0200
commitfe4dd5c7fe77591ee8d7780d3f5e2e9b9334c2c5 (patch)
treeba465cbde75e7f2e7dd5216246713bf6003a1bfd /src
parent45c6086f8c0c0f6fe1a46b950682abfdbf104687 (diff)
downloadvarnish-mib-fe4dd5c7fe77591ee8d7780d3f5e2e9b9334c2c5.tar.gz
varnish-mib-fe4dd5c7fe77591ee8d7780d3f5e2e9b9334c2c5.tar.bz2
Minor changes
Diffstat (limited to 'src')
-rw-r--r--src/ban.c10
-rw-r--r--src/betab.c8
-rw-r--r--src/main.c6
-rw-r--r--src/varnish-mib.88
-rw-r--r--src/vcli.c16
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,8 +1,8 @@
/* This file is part of varnish-mib -*- c -*-
- Copyright (C) 2014-2018 Sergey Poznyakoff
+ Copyright (C) 2014-2019 Sergey Poznyakoff
Varnish-mib is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
any later version.
@@ -48,13 +48,13 @@ varnish_ban(netsnmp_agent_request_info *reqinfo,
if (!expr) {
snmp_log(LOG_ERR, "out of memory\n");
return SNMP_ERR_GENERR;
}
memcpy(expr, requests->requestvb->val.string, len);
expr[len] = 0;
- DEBUGMSGTL(("varnish_mib:ban", "setting ban %s\n", expr));
+ DEBUGMSGTL(("ban", "setting ban %s\n", expr));
rc = vcli_connect(vsm, &conn);
if (rc == SNMP_ERR_NOERROR) {
rc = send_ban_cmd(&conn, expr);
vcli_disconnect(&conn);
}
free(expr);
@@ -116,13 +116,13 @@ banTable_load(netsnmp_cache *cache, void *vmagic)
char *p;
struct vsm *vsm = varnish_get_vsm_data();
if (!vsm)
return SNMP_ERR_GENERR;
- DEBUGMSGTL(("varnish_mib:ban", "reloading ban table\n"));
+ DEBUGMSGTL(("ban", "reloading ban table\n"));
rc = vcli_connect(vsm, &conn);
if (rc != SNMP_ERR_NOERROR)
return rc;
if (vcli_asprintf(&conn, "ban.list\n") || vcli_write(&conn))
@@ -226,23 +226,23 @@ banTable_load(netsnmp_cache *cache, void *vmagic)
create_entry(table, idx, &e);
++idx;
q += e.banExpression_len;
p = q;
}
vcli_disconnect(&conn);
- DEBUGMSGTL(("varnish_mib:ban", "loaded %ld ban entries\n", idx));
+ DEBUGMSGTL(("ban", "loaded %ld ban entries\n", idx));
return 0;
}
void
banTable_free(netsnmp_cache *cache, void *vmagic)
{
netsnmp_tdata *table = (netsnmp_tdata *) vmagic;
netsnmp_tdata_row *row;
- DEBUGMSGTL(("varnish_mib:ban", "freeing ban table\n"));
+ DEBUGMSGTL(("ban", "freeing ban table\n"));
while ((row = netsnmp_tdata_row_first(table))) {
struct banTable_entry *entry = row->data;
free(entry->banExpression);
free(entry->banTime);
SNMP_FREE(entry);
netsnmp_tdata_remove_and_delete_row(table, row);
diff --git a/src/betab.c b/src/betab.c
index 768503a..c472b9d 100644
--- a/src/betab.c
+++ b/src/betab.c
@@ -1,8 +1,8 @@
/* This file is part of varnish-mib
- Copyright (C) 2014, 2018 Sergey Poznyakoff
+ Copyright (C) 2014-2019 Sergey Poznyakoff
Varnish-mib is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
any later version.
@@ -133,13 +133,13 @@ backend_register(char const *name, size_t len, char const *param,
int
backendTable_load(netsnmp_cache *cache, void *vmagic)
{
netsnmp_tdata *table_data = (netsnmp_tdata *) vmagic;
struct backend_dfn *dfn;
- DEBUGMSGTL(("varnish_mib:backend", "loading backend table\n"));
+ DEBUGMSGTL(("backend", "loading backend table\n"));
VTAILQ_FOREACH(dfn, &backends, list) {
int i;
netsnmp_tdata_row *row;
struct backendTable_entry *ent;
@@ -179,13 +179,13 @@ backendTable_load(netsnmp_cache *cache, void *vmagic)
void
backendTable_free(netsnmp_cache *cache, void *vmagic)
{
netsnmp_tdata *table = (netsnmp_tdata *) vmagic;
netsnmp_tdata_row *row;
- DEBUGMSGTL(("varnish_mib:backend", "freeing backend table\n"));
+ DEBUGMSGTL(("backend", "freeing backend table\n"));
while ((row = netsnmp_tdata_row_first(table))) {
struct backendTable_entry *entry = row->data;
free(entry->vbeIdent);
SNMP_FREE(entry);
netsnmp_tdata_remove_and_delete_row(table, row);
}
@@ -331,13 +331,13 @@ backend_collect_addr(struct vsm *vsm)
struct backend_dfn *dfn;
struct vcli_conn conn;
int rc;
struct backend_name_list namelist
= VTAILQ_HEAD_INITIALIZER(namelist);
- DEBUGMSGTL(("varnish_mib:backend", "getting backend info\n"));
+ DEBUGMSGTL(("backend", "getting backend info\n"));
rc = vcli_connect(vsm, &conn);
if (rc != SNMP_ERR_NOERROR)
return rc;
/* Select backend names */
diff --git a/src/main.c b/src/main.c
index a8d089f..01a24a9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -158,12 +158,15 @@ main(int argc, char **argv)
netsnmp_ds_set_string(NETSNMP_DS_LIBRARY_ID,
NETSNMP_DS_LIB_APPTYPE, progname);
netsnmp_ds_set_boolean(NETSNMP_DS_APPLICATION_ID,
NETSNMP_DS_AGENT_ROLE, 1);
+ if (!log_set)
+ snmp_enable_stderrlog();
+
SOCK_STARTUP;
init_agent(progname);
init_varnish_mib();
init_snmp(progname);
if (post_config())
exit(1);
@@ -179,15 +182,12 @@ main(int argc, char **argv)
}
openlog(progname, LOG_CONS|LOG_PID, LOG_DAEMON);
if (!log_set) {
snmp_enable_syslog_ident(progname, LOG_DAEMON);
snmp_disable_stderrlog();
}
- } else {
- if (!log_set)
- snmp_enable_stderrlog();
}
pidfile_create(pid_file);
sa.sa_handler = stophandler;
sa.sa_flags = 0;
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
@@ -117,24 +117,24 @@ Turn on debugging output for the given TOKEN(s). Special token
are:
.RS 4
.TP
.B varnish_mib
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
.B CLI
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.
.RE
.TP
.B \-f
Remain in the foreground.
.TP
diff --git a/src/vcli.c b/src/vcli.c
index 94f0eef..8669446 100644
--- a/src/vcli.c
+++ b/src/vcli.c
@@ -1,8 +1,8 @@
/* This file is part of varnish-mib -*- c -*-
- Copyright (C) 2014-2018 Sergey Poznyakoff
+ Copyright (C) 2014-2019 Sergey Poznyakoff
Varnish-mib is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3, or (at your option)
any later version.
@@ -196,13 +196,13 @@ vcli_read(struct vcli_conn *conn, size_t size)
}
if (ret == 0) {
if (conn->bufsize == 0)
ret = -1;
conn->base[conn->bufsize] = 0;
- DEBUGMSGTL(("varnish_mib:vcli:transcript", "<<varnish: %s\n", conn->base));
+ DEBUGMSGTL(("vcli:transcript", "<<varnish: %s\n", conn->base));
}
return ret;
}
static int
@@ -279,13 +279,13 @@ vcli_getline(struct vcli_conn *conn)
int
vcli_write(struct vcli_conn *conn)
{
size_t size;
- DEBUGMSGTL(("varnish_mib:vcli:transcript", ">>varnish: %s\n", conn->base));
+ DEBUGMSGTL(("vcli:transcript", ">>varnish: %s\n", conn->base));
for (size = 0; size < conn->bufsize; ) {
int n = write(conn->fd, conn->base + size,
conn->bufsize - size);
if (n < 0) {
snmp_log(LOG_ERR, "write error: %s\n",
strerror(errno));
@@ -487,47 +487,45 @@ vcli_handshake(struct vcli_conn *conn)
}
static int
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);
} else {
char *T_arg, *p;
T_arg = VSM_Dup(vsm, "Arg", "-T");
if (!T_arg) {
snmp_log(LOG_ERR, "no -T arg in shared memory\n");
return SNMP_ERR_GENERR;
}
p = T_arg + strlen(T_arg) - 1;
if (*p == '\n')
*p = 0;
- DEBUGMSGTL(("varnish_mib:vcli", "-T '%s'\n", T_arg));
+ DEBUGMSGTL(("vcli", "-T '%s'\n", T_arg));
*addr = vcli_parse_sockaddr(T_arg);
free(T_arg);
}
if (!*addr)
return SNMP_ERR_GENERR;
if (vcli_secret) {
- DEBUGMSGTL(("varnish_mib:vcli",
- "using configured secret\n"));
+ DEBUGMSGTL(("vcli", "using configured secret\n"));
*secret = strdup(vcli_secret);
if (!*secret) {
snmp_log(LOG_ERR, "out of memory");
return SNMP_ERR_GENERR;
}
} else {
char *S_arg = VSM_Dup(vsm, "Arg", "-S");
if (!S_arg) {
snmp_log(LOG_ERR, "no -S arg in shared memory\n");
return SNMP_ERR_GENERR;
}
- DEBUGMSGTL(("varnish_mib:vcli", "-S '%s'\n", S_arg));
+ DEBUGMSGTL(("vcli", "-S '%s'\n", S_arg));
*secret = S_arg;
}
return 0;
}
int

Return to:

Send suggestions and report system problems to the System administrator.