diff options
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | NEWS | 11 | ||||
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | git2chg.awk | 2 | ||||
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/auth.c | 2 | ||||
-rw-r--r-- | src/ban.c | 6 | ||||
-rw-r--r-- | src/betab.c | 5 | ||||
-rw-r--r-- | src/varnish-mib.8 | 2 | ||||
-rw-r--r-- | src/varnish_mib.mib2c | 14 | ||||
-rw-r--r-- | src/vcli.c | 2 |
12 files changed, 29 insertions, 25 deletions
diff --git a/Makefile.am b/Makefile.am index 9f585f9..0334f01 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,8 @@ # This file is part of varnish-mib -*- automake -*- -# Copyright (C) 2014 Sergey Poznyakoff +# Copyright (C) 2014-2015 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. # @@ -1,20 +1,25 @@ -Varnish-mib NEWS -- history of user-visible changes. 2014-11-28 -Copyright (C) 2014 Sergey Poznyakoff +Varnish-mib NEWS -- history of user-visible changes. 2015-02-02 +Copyright (C) 2014-2015 Sergey Poznyakoff See the end of file for copying conditions. Please send Varnish-mib bug reports to <gray@gnu.org> +Version 1.0.90 (Git) + +* Don't exit if unable to open Varnish memory file + + Version 1.0, 2014-11-28 Initial release. * Copyright information: -Copyright (C) 2014 Sergey Poznyakoff +Copyright (C) 2014-2015 Sergey Poznyakoff Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that the copyright notice and this permission notice are preserved, thus giving the recipient permission to redistribute in turn. @@ -1,8 +1,8 @@ Varnish-mib README -Copyright (C) 2014 Sergey Poznyakoff +Copyright (C) 2014-2015 Sergey Poznyakoff See the end of file for copying conditions. * Introduction This file contains brief information about configuring, testing and using Varnish-mib. It is *not* intended as a replacement diff --git a/configure.ac b/configure.ac index 9b4d998..b5d6636 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ # This file is part of Varnish-mib -*- autoconf -*- -# Copyright (C) 2014 Sergey Poznyakoff +# Copyright (C) 2014-2015 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. # @@ -12,13 +12,13 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with Varnish-mib. If not, see <http://www.gnu.org/licenses/>. AC_PREREQ(2.69) -AC_INIT([varnish-mib], 1.0, [gray@gnu.org]) +AC_INIT([varnish-mib], 1.0.90, [gray@gnu.org]) AC_CONFIG_SRCDIR(src/varnish_mib.mib2c) AM_CONFIG_HEADER(config.h) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_SYSTEM diff --git a/git2chg.awk b/git2chg.awk index 6dad87e..e5dbe15 100644 --- a/git2chg.awk +++ b/git2chg.awk @@ -1,8 +1,8 @@ # This file is part of grecs -# Copyright (C) 2007-2014 Sergey Poznyakoff +# Copyright (C) 2007-2015 Sergey Poznyakoff # # Grecs 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. # diff --git a/src/Makefile.am b/src/Makefile.am index a10abd1..3c066f1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,8 +1,8 @@ # This file is part of varnish-mib -*- automake -*- -# Copyright (C) 2014 Sergey Poznyakoff +# Copyright (C) 2014-2015 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. # @@ -1,8 +1,8 @@ /* This file is part of varnish-mib -*- c -*- - Copyright (C) 2014 Sergey Poznyakoff + Copyright (C) 2014-2015 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. @@ -1,8 +1,8 @@ /* This file is part of varnish-mib -*- c -*- - Copyright (C) 2014 Sergey Poznyakoff + Copyright (C) 2014-2015 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. @@ -152,15 +152,17 @@ banTable_load(netsnmp_cache *cache, void *vmagic) struct vcli_conn conn; char *p; struct VSM_data *vd; DEBUGMSGTL(("varnish_ban", "reloading ban table\n")); vd = varnish_get_vsm_data(); + if (!vd) + return SNMP_ERR_NOSUCHNAME; rc = vcli_connect(vd, &conn); if (rc != SNMP_ERR_NOERROR) - return rc; + return rc; if (vcli_asprintf(&conn, "ban.list\n") || vcli_write(&conn)) return SNMP_ERR_GENERR; if (vcli_read_response(&conn)) return SNMP_ERR_GENERR; diff --git a/src/betab.c b/src/betab.c index 41c18e7..b583958 100644 --- a/src/betab.c +++ b/src/betab.c @@ -220,15 +220,18 @@ create_entry_cb(void *priv, const struct VSC_point *const pt) way to backend statistics is to iterate over all statistics data, selecting the entries marked as VBE. That's what this function does. */ int backendTable_load(netsnmp_cache *cache, void *vmagic) { - struct VSM_data *vd = varnish_get_vsm_data(); struct betab_priv bp; + struct VSM_data *vd = varnish_get_vsm_data(); + if (!vd) + return SNMP_ERR_NOSUCHNAME; + bp.idx = -1; bp.err = 0; bp.table = (netsnmp_tdata *) vmagic; memset(&bp.ent, 0, sizeof(bp.ent)); DEBUGMSGTL(("varnish_ban", "loading backend table\n")); diff --git a/src/varnish-mib.8 b/src/varnish-mib.8 index cc3276b..4559b0c 100644 --- a/src/varnish-mib.8 +++ b/src/varnish-mib.8 @@ -1,8 +1,8 @@ .\" This file is part of Varnish-mib -*- nroff -*- -.\" Copyright (C) 2014 Sergey Poznyakoff +.\" Copyright (C) 2014-2015 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. .\" diff --git a/src/varnish_mib.mib2c b/src/varnish_mib.mib2c index ae344be..a5367e0 100644 --- a/src/varnish_mib.mib2c +++ b/src/varnish_mib.mib2c @@ -1,8 +1,8 @@ # This file is part of varnish-mib -*- c -*- -# Copyright (C) 2014 Sergey Poznyakoff +# Copyright (C) 2014-2015 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. # @@ -195,15 +195,12 @@ void varnish_backend_table_timeout_parser(const char *token, char *line); static struct VSM_data *vd; void varnish_snmp_init(void) { vd = VSM_New(); - - if (VSM_Open(vd)) - exit(1); } void varnish_snmp_deinit(void) { VSM_Close(vd); @@ -237,18 +234,15 @@ handle_$i(netsnmp_mib_handler *handler, int ret; @end@ @startperl@ &{$vars{'varnish_translate'}}($vars{'i'}); @endperl@ - - if (VSM_Abandoned(vd)) { - DEBUGMSGTL(("$modulename", "reopening vd\n")); - VSM_Close(vd); - VSM_Open(vd); - } + + if (!varnish_get_vsm_data()) + return SNMP_ERR_NOSUCHNAME; switch(reqinfo->mode) { case MODE_GET: @if $varnish_type eq 'MAIN'@ { struct VSC_C_main const *st = VSC_Main(vd, NULL); @@ -1,8 +1,8 @@ /* This file is part of varnish-mib -*- c -*- - Copyright (C) 2014 Sergey Poznyakoff + Copyright (C) 2014-2015 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. |