[network-manager-vpnc/th/vpn-plugin-debug-bgo766872: 6/8] service: allow setting log_level via environment variable NM_VPN_LOG_LEVEL

[Thomas Haller <thaller src gnome org>]

commit 6ba834e8d3be68922231150727df23bd24ec0f4a
Author: Thomas Haller <thaller redhat com>
Date:   Tue May 24 23:22:53 2016 +0200

    service: allow setting log_level via environment variable NM_VPN_LOG_LEVEL

 src/Makefile.am       |    8 +++++++-
 src/nm-vpnc-service.c |    5 ++++-
 2 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index c8850ca..4025bb8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,6 +13,8 @@ AM_CPPFLAGS = \
 
 libexec_PROGRAMS = nm-vpnc-service nm-vpnc-service-vpnc-helper
 
+###############################################################################
+
 nm_vpnc_service_SOURCES = \
        $(top_srcdir)/shared/nm-service-defines.h \
        nm-vpnc-service.c \
@@ -22,8 +24,10 @@ nm_vpnc_service_SOURCES = \
 
 nm_vpnc_service_LDADD = \
        $(GLIB_LIBS) \
-       $(LIBNM_LIBS)
+       $(LIBNM_LIBS) \
+       $(top_builddir)/shared/libnm-vpn-plugin-vpnc-shared.la
 
+###############################################################################
 
 nm_vpnc_service_vpnc_helper_SOURCES = \
        nm-vpnc-service-vpnc-helper.c
@@ -32,6 +36,8 @@ nm_vpnc_service_vpnc_helper_LDADD = \
        $(GTHREAD_LIBS) \
        $(LIBNM_LIBS)
 
+###############################################################################
+
 noinst_PROGRAMS = test-vpnc-output
 
 test_vpnc_output_SOURCES = \
diff --git a/src/nm-vpnc-service.c b/src/nm-vpnc-service.c
index 34aff94..492e8d6 100644
--- a/src/nm-vpnc-service.c
+++ b/src/nm-vpnc-service.c
@@ -36,6 +36,7 @@
 #include <locale.h>
 
 #include "utils.h"
+#include "nm-utils/nm-shared-utils.h"
 #include "nm-vpn/nm-vpn-plugin-macros.h"
 
 #if !defined(DIST_VERSION)
@@ -1271,7 +1272,9 @@ main (int argc, char *argv[])
        if (getenv ("VPNC_DEBUG"))
                gl.debug = TRUE;
 
-       gl.log_level = gl.debug ? LOG_INFO : LOG_NOTICE;
+       gl.log_level = _nm_utils_ascii_str_to_int64 (getenv ("NM_VPN_LOG_LEVEL"),
+                                                    10, 0, LOG_DEBUG,
+                                                    gl.debug ? LOG_INFO : LOG_NOTICE);
 
        _LOGD ("nm-vpnc-service (version " DIST_VERSION ") starting...");
        _LOGD ("   vpnc interactive mode is %s", interactive_available ? "enabled" : "disabled");