kolan
/
gkrellm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- gkrellmd: use new logging system and add syslog-handler for logging to syslog or windows event log 

- gkrellmd: redo argv parsing, the old one could have read one item too far
- gkrellmd win32: search plugins in installation directory
- gkrellmd win32: print helpful messages on service install/uninstall
- gkrellmd win32: added install target for gkrellmd.conf
This commit is contained in:
Stefan Gehn 2008-09-28 15:51:42 +00:00
parent d22da7e24e
commit c994994734
4 changed files with 418 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
server/Makefile
View File

@ -18,6 +18,10 @@ INCLUDEDIRMODE ?= 755
LIBDIR ?= $(INSTALLROOT)/lib LIBDIR ?= $(INSTALLROOT)/lib
LIBDIRMODE ?= 755 LIBDIRMODE ?= 755
CFGDIR ?= $(INSTALLROOT)/etc
CFGDIRMODE ?= 755
CFGMODE ?= 644
SMANDIR ?= $(INSTALLROOT)/share/man/man1 SMANDIR ?= $(INSTALLROOT)/share/man/man1
MANMODE ?= 644 MANMODE ?= 644
MANDIRMODE ?= 755 MANDIRMODE ?= 755
@ -25,6 +29,9 @@ INSTALL ?= install
LINK_FLAGS ?= -Wl,-E LINK_FLAGS ?= -Wl,-E
EXTRAOBJS = EXTRAOBJS =
SHARED_PATH = ../shared
# Make GNU Make search for sources somewhere else as well
VPATH = $(SHARED_PATH)
ifeq ($(without-libsensors),yes) ifeq ($(without-libsensors),yes)
CONFIGURE_ARGS += --without-libsensors CONFIGURE_ARGS += --without-libsensors
@ -44,7 +51,7 @@ endif
CC ?= gcc CC ?= gcc
STRIP ?= -s STRIP ?= -s
GKRELLMD_INCLUDES = gkrellmd.h GKRELLMD_INCLUDES = gkrellmd.h $(SHARED_PATH)/log.h
PKG_INCLUDE = `$(PKG_CONFIG) --cflags glib-2.0 gthread-2.0` PKG_INCLUDE = `$(PKG_CONFIG) --cflags glib-2.0 gthread-2.0`
PKG_LIB = `$(PKG_CONFIG) --libs glib-2.0 gmodule-2.0 gthread-2.0` PKG_LIB = `$(PKG_CONFIG) --libs glib-2.0 gmodule-2.0 gthread-2.0`
@ -52,24 +59,24 @@ PKG_LIB = `$(PKG_CONFIG) --libs glib-2.0 gmodule-2.0 gthread-2.0`
GLIB12_INCLUDE = `glib-config --cflags` GLIB12_INCLUDE = `glib-config --cflags`
GLIB12_LIB = `glib-config --libs glib gmodule` GLIB12_LIB = `glib-config --libs glib gmodule`
FLAGS = -O2 -I.. $(PKG_INCLUDE) $(GTOP_INCLUDE) FLAGS = -O2 $(PKG_INCLUDE)
ifeq ($(glib12),1)
FLAGS = -O2 -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE)
endif
ifeq ($(glib12),yes)
FLAGS = -O2 -I.. $(GLIB12_INCLUDE) $(GTOP_INCLUDE)
endif
FLAGS+= $(PTHREAD_INC)
LIBS = $(PKG_LIB) $(GTOP_LIBS_D) $(SYS_LIBS) $(SENSORS_LIBS)
ifeq ($(glib12),1) ifeq ($(glib12),1)
LIBS = $(GLIB12_LIB) $(GTOP_LIBS_D) $(SYS_LIBS) $(SENSORS_LIBS) FLAGS = -O2 $(GLIB12_INCLUDE)
endif endif
ifeq ($(glib12),yes) ifeq ($(glib12),yes)
LIBS = $(GLIB12_LIB) $(GTOP_LIBS_D) $(SYS_LIBS) $(SENSORS_LIBS) FLAGS = -O2 $(GLIB12_INCLUDE)
endif endif
FLAGS += $(GTOP_INCLUDE) $(PTHREAD_INC) -I.. -I$(SHARED_PATH) -DGKRELLM_SERVER
LIBS = $(PKG_LIB)
ifeq ($(glib12),1)
LIBS = $(GLIB12_LIB)
endif
ifeq ($(glib12),yes)
LIBS = $(GLIB12_LIB)
endif
LIBS += $(GTOP_LIBS_D) $(SYS_LIBS) $(SENSORS_LIBS)
ifeq ($(debug),1) ifeq ($(debug),1)
FLAGS += -g FLAGS += -g
@ -100,15 +107,12 @@ ifeq ($(HAVE_GETADDRINFO),1)
FLAGS += -DHAVE_GETADDRINFO FLAGS += -DHAVE_GETADDRINFO
endif endif
override CC += -Wall $(FLAGS) override CC += -Wall $(FLAGS)
OS_NAME=$(shell uname -s) OS_NAME=$(shell uname -s)
OS_RELEASE=$(shell uname -r) OS_RELEASE=$(shell uname -r)
OBJS = main.o monitor.o mail.o plugins.o glib.o utils.o sysdeps-unix.o OBJS = main.o monitor.o mail.o plugins.o glib.o utils.o sysdeps-unix.o log.o
EXTRAOBJS =
all: gkrellmd all: gkrellmd
@ -180,6 +184,10 @@ install_man:
$(INSTALL) -d -m $(MANDIRMODE) $(SMANDIR) $(INSTALL) -d -m $(MANDIRMODE) $(SMANDIR)
$(INSTALL) -c -m $(MANMODE) ../gkrellmd.1 $(SMANDIR)/$(PACKAGE_D).1 $(INSTALL) -c -m $(MANMODE) ../gkrellmd.1 $(SMANDIR)/$(PACKAGE_D).1
install_cfg:
$(INSTALL) -d -m $(CFGDIRMODE) $(CFGDIR)
$(INSTALL) -c -m $(CFGMODE) gkrellmd.conf $(CFGDIR)/gkrellmd.conf
uninstall: uninstall:
rm -f $(SINSTALLDIR)/$(PACKAGE_D) rm -f $(SINSTALLDIR)/$(PACKAGE_D)
rm -f $(SMANDIR)/$(PACKAGE_D).1 rm -f $(SMANDIR)/$(PACKAGE_D).1
@ -205,8 +213,8 @@ install_solaris:
chgrp sys $(SINSTALLDIR)/$(PACKAGE_D) chgrp sys $(SINSTALLDIR)/$(PACKAGE_D)
chmod g+s $(SINSTALLDIR)/$(PACKAGE_D) chmod g+s $(SINSTALLDIR)/$(PACKAGE_D)
install_windows: install_windows: install_inc install_cfg
$(MAKE) BINEXT=".exe" install_bin install_inc $(MAKE) BINEXT=".exe" install_bin
$(INSTALL) -d -m $(LIBDIRMODE) $(LIBDIR) $(INSTALL) -d -m $(LIBDIRMODE) $(LIBDIR)
$(INSTALL) -c -m $(BINMODE) libgkrellmd.a $(LIBDIR) $(INSTALL) -c -m $(BINMODE) libgkrellmd.a $(LIBDIR)
@ -221,19 +229,20 @@ SYSDEPS = ../src/sysdeps/bsd-common.c ../src/sysdeps/bsd-net-open.c \
../src/sysdeps/openbsd.c ../src/sysdeps/sensors-common.c \ ../src/sysdeps/openbsd.c ../src/sysdeps/sensors-common.c \
../src/sysdeps/solaris.c ../src/sysdeps/win32.c ../src/sysdeps/solaris.c ../src/sysdeps/win32.c
main.o: main.c gkrellmd.h GKRELLMD_H = gkrellmd.h gkrellmd-private.h
monitor.o: monitor.c gkrellmd.h
mail.o: mail.c gkrellmd.h main.o: main.c $(GKRELLMD_H)
plugins.o: plugins.c gkrellmd.h monitor.o: monitor.c $(GKRELLMD_H)
glib.o: glib.c gkrellmd.h mail.o: mail.c $(GKRELLMD_H)
utils.o: utils.c gkrellmd.h plugins.o: plugins.c $(GKRELLMD_H)
sysdeps-unix.o: sysdeps-unix.c gkrellmd.h ../src/gkrellm-sysdeps.h $(SYSDEPS) glib.o: glib.c $(GKRELLMD_H)
utils.o: utils.c $(GKRELLMD_H)
sysdeps-unix.o: sysdeps-unix.c ../src/gkrellm-sysdeps.h $(SYSDEPS) $(GKRELLMD_H)
log.o: $(SHARED_PATH)/log.c $(SHARED_PATH)/log.h $(GKRELLMD_H)
win32-gui.o: win32-gui.c win32-gui.o: win32-gui.c
win32-plugin.o: win32-plugin.c win32-plugin.h gkrellmd.h win32-plugin.o: win32-plugin.c win32-plugin.h $(GKRELLMD_H)
win32-libgkrellmd.o: win32-libgkrellmd.c win32-plugin.h gkrellmd.h
libgkrellmd.a: win32-libgkrellmd.o
ar -cr libgkrellmd.a win32-libgkrellmd.o
win32-resource.o: win32-resource.rc win32-resource.h win32-resource.o: win32-resource.rc win32-resource.h
windres -I.. -o win32-resource.o win32-resource.rc windres -I.. -o win32-resource.o win32-resource.rc
win32-libgkrellmd.o: win32-libgkrellmd.c win32-plugin.h $(GKRELLMD_H)
libgkrellmd.a: win32-libgkrellmd.o
ar -cr libgkrellmd.a win32-libgkrellmd.o

9
server/gkrellmd.h
View File

@ -21,6 +21,8 @@
#ifndef GKRELLMD_H #ifndef GKRELLMD_H
#define GKRELLMD_H #define GKRELLMD_H
#include "log.h"
#include <glib.h> #include <glib.h>
#include <stdio.h> #include <stdio.h>
@ -47,14 +49,15 @@
#include <grp.h> #include <grp.h>
#if defined(__solaris__) #if defined(__solaris__)
#include <sys/filio.h> #include <sys/filio.h>
#endif #endif /* defined(__solaris__) */
#include <sys/select.h> #include <sys/select.h>
#include <sys/wait.h> #include <sys/wait.h>
#else #else
#define ioctl ioctlsocket
#include <winsock2.h> #include <winsock2.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
#endif typedef int sa_family_t; // WIN32 uses int for ai_family;
#include <stdint.h> // defines uint32_t
#endif /* !defined(WIN32) */
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>

532
server/main.c
View File

@ -21,11 +21,9 @@
#include "gkrellmd.h" #include "gkrellmd.h"
#include "gkrellmd-private.h" #include "gkrellmd-private.h"
#if defined(WIN32) #include "log-private.h"
#include <tchar.h>
#endif
// we do have addrinfo on win32 but do not have getaddrinfo(), doh // win32 defines addrinfo but only supports getaddrinfo call on winxp or newer
#if !defined(HAVE_GETADDRINFO) && !defined(WIN32) #if !defined(HAVE_GETADDRINFO) && !defined(WIN32)
struct addrinfo struct addrinfo
{ {
@ -38,7 +36,7 @@ struct addrinfo
struct sockaddr *ai_addr; /* binary address */ struct sockaddr *ai_addr; /* binary address */
struct addrinfo *ai_next; /* next structure in linked list */ struct addrinfo *ai_next; /* next structure in linked list */
}; };
#endif // HAVE_GETADDRINFO && !WIN32 #endif // !HAVE_GETADDRINFO
#if !defined(IPV6_V6ONLY) && defined(IPV6_BINDV6ONLY) #if !defined(IPV6_V6ONLY) && defined(IPV6_BINDV6ONLY)
#define IPV6_V6ONLY IPV6_BINDV6ONLY #define IPV6_V6ONLY IPV6_BINDV6ONLY
@ -71,16 +69,14 @@ struct
*/ */
static gboolean service_is_one = FALSE; static gboolean service_is_one = FALSE;
/* // Flag that is TRUE while gkrellmd should stay in its main loop
Flag that is TRUE while gkrellmd should stay in its main loop
*/
static gboolean service_running = FALSE; static gboolean service_running = FALSE;
/* Name for the installed windows service */ // Unique name for the installed windows service (do not translate!)
static TCHAR* service_name = TEXT("gkrellmd"); static wchar_t* service_name = L"gkrellmd";
/* User visible name for the installed windows service */ // User visible name for the installed windows service
static TCHAR* service_display_name = TEXT("GKrellM Daemon"); static wchar_t* service_display_name = L"GKrellM Daemon";
/* /*
Current service status if running as a service, may be stopped or running Current service status if running as a service, may be stopped or running
@ -93,9 +89,92 @@ static SERVICE_STATUS service_status;
Main use is to stop the running service. Main use is to stop the running service.
*/ */
static SERVICE_STATUS_HANDLE service_status_handle = 0; static SERVICE_STATUS_HANDLE service_status_handle = 0;
/*
Handle to our event log source.
The Windows Event Log is used as a replacement for syslog-logging.
*/
static HANDLE h_event_log = NULL;
#endif /* defined(WIN32) */ #endif /* defined(WIN32) */
static gboolean
gkrellmd_syslog_init()
{
#if defined(WIN32)
h_event_log = RegisterEventSourceW(NULL, service_name);
if (h_event_log == NULL)
{
g_warning("Cannot register event source for logging into Windows Event Log.\n");
return FALSE;
}
#else
// Unix needs no logging initialization
#endif
return TRUE;
}
static gboolean
gkrellmd_syslog_cleanup()
{
#if defined(WIN32)
if (h_event_log)
DeregisterEventSource(h_event_log);
h_event_log = NULL;
#else
// Unix needs no further logging cleanup
#endif
return TRUE;
}
static void gkrellmd_syslog_log(GLogLevelFlags log_level, const gchar *message)
{
#if defined(WIN32)
WORD event_type;
const char *p_buf[1];
// Abort if event source is missing
if (h_event_log == NULL)
return;
event_type = EVENTLOG_INFORMATION_TYPE;
if (log_level & G_LOG_LEVEL_WARNING)
event_type = EVENTLOG_WARNING_TYPE;
if (log_level & G_LOG_LEVEL_CRITICAL || log_level & G_LOG_LEVEL_ERROR)
event_type = EVENTLOG_ERROR_TYPE;
p_buf[0] = message;
ReportEventA(
h_event_log, // Event source handle (HANDLE)
event_type, // Event type (WORD)
0, // Event category (WORD)
0, // Event identifier (DWORD)
NULL, // user security identifier (PSID)
1, // Number of substitution strings (WORD)
0, // Data Size (DWORD)
p_buf, // Pointer to strings
NULL // Pointer to Data
);
#else
int facility_priority;
// default to info and override with other states if they are more important
facility_priority = LOG_MAKEPRI(LOG_DAEMON, LOG_INFO);
if (log_level & G_LOG_LEVEL_DEBUG)
facility_priority = LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG);
if (log_level & G_LOG_LEVEL_WARNING)
facility_priority = LOG_MAKEPRI(LOG_DAEMON, LOG_WARNING);
if (log_level & G_LOG_LEVEL_ERROR)
facility_priority = LOG_MAKEPRI(LOG_DAEMON, LOG_ERR);
if (log_level & G_LOG_LEVEL_CRITICAL)
facility_priority = LOG_MAKEPRI(LOG_DAEMON, LOG_CRIT);
syslog(facility_priority, message);
#endif // defined(WIN32)
} // gkrellmd_syslog_log()
static void static void
make_pidfile(void) make_pidfile(void)
@ -112,7 +191,7 @@ make_pidfile(void)
fclose(f); fclose(f);
} }
else else
fprintf(stderr, "gkrellmd: Can't create pidfile %s\n", _GK.pidfile); g_warning("Can't create pidfile %s\n", _GK.pidfile);
#endif #endif
} }
@ -129,14 +208,16 @@ static void
gkrellmd_cleanup() gkrellmd_cleanup()
{ {
gkrellm_sys_main_cleanup(); gkrellm_sys_main_cleanup();
gkrellm_log_cleanup();
remove_pidfile(); remove_pidfile();
} }
static void static void
cb_sigterm(gint sig) cb_sigterm(gint sig)
{ {
if (_GK.verbose) g_message("GKrellM Daemon %d.%d.%d%s: Exiting normally\n",
printf("gkrellmd: Got SIGINT/SIGTERM signal, exiting\n"); GKRELLMD_VERSION_MAJOR, GKRELLMD_VERSION_MINOR,
GKRELLMD_VERSION_REV, GKRELLMD_EXTRAVERSION);
gkrellmd_cleanup(); gkrellmd_cleanup();
exit(0); exit(0);
} }
@ -156,7 +237,7 @@ gkrellmd_send_to_client(GkrellmdClient *client, gchar *buf)
if (n < 0 && errno == EPIPE) if (n < 0 && errno == EPIPE)
{ {
if (_GK.verbose) if (_GK.verbose)
printf("Write on closed pipe to host %s\n", client->hostname); g_print("Write on closed pipe to host %s\n", client->hostname);
client->alive = FALSE; client->alive = FALSE;
} }
return n; return n;
@ -400,7 +481,7 @@ allow_host(GkrellmdClient *client, struct sockaddr *sa, socklen_t salen)
snprintf(buf, sizeof(buf), _("Connection not allowed from %s\n"), snprintf(buf, sizeof(buf), _("Connection not allowed from %s\n"),
hostname ? hostname : addr); hostname ? hostname : addr);
fprintf(stderr, "gkrellmd: %s", buf), g_warning(buf),
gkrellmd_send_to_client(client, "<error>\n"); gkrellmd_send_to_client(client, "<error>\n");
gkrellmd_send_to_client(client, buf); gkrellmd_send_to_client(client, buf);
return FALSE; return FALSE;
@ -425,8 +506,7 @@ accept_client(gint fd, struct sockaddr *sa, socklen_t salen)
{ {
if (client_limit) if (client_limit)
{ {
fprintf(stderr, _("gkrellmd: too many clients, rejecting %s\n"), g_message(_("Too many clients, rejecting %s\n"), client->hostname);
client->hostname);
gkrellmd_send_to_client(client, gkrellmd_send_to_client(client,
"<error>\nClient limit exceeded.\n"); "<error>\nClient limit exceeded.\n");
} }
@ -442,7 +522,7 @@ accept_client(gint fd, struct sockaddr *sa, socklen_t salen)
//getline(fd, buf, sizeof(buf)); //getline(fd, buf, sizeof(buf));
if (_GK.verbose) if (_GK.verbose)
printf(_("connect string from client: %s\n"), buf); g_print(_("connect string from client: %s\n"), buf);
if ( sscanf(buf, "%31s %d.%d.%d", name, &client->major_version, if ( sscanf(buf, "%31s %d.%d.%d", name, &client->major_version,
&client->minor_version, &client->rev_version) == 4 &client->minor_version, &client->rev_version) == 4
@ -452,8 +532,7 @@ accept_client(gint fd, struct sockaddr *sa, socklen_t salen)
gkrellmd_client_list = g_list_append(gkrellmd_client_list, client); gkrellmd_client_list = g_list_append(gkrellmd_client_list, client);
return client; return client;
} }
fprintf(stderr, _("gkrellmd: bad connect line from %s: %s\n"), g_warning(_("Bad connect line from %s: %s\n"), client->hostname, buf);
client->hostname, buf);
gkrellmd_send_to_client(client, "<error>\nBad connect string!"); gkrellmd_send_to_client(client, "<error>\nBad connect string!");
g_free(client->hostname); g_free(client->hostname);
@ -472,8 +551,7 @@ remove_client(gint fd)
client = (GkrellmdClient *) list->data; client = (GkrellmdClient *) list->data;
if (client->fd == fd) if (client->fd == fd)
{ {
if (_GK.verbose) g_message(_("Removing client %s\n"), client->hostname);
printf("Removing client %s\n", client->hostname);
close(fd); close(fd);
g_free(client->hostname); g_free(client->hostname);
g_free(client); g_free(client);
@ -491,6 +569,12 @@ parse_config(gchar *config, gchar *arg)
gkrellm_free_glist_and_data(&allow_host_list); gkrellm_free_glist_and_data(&allow_host_list);
return 0; return 0;
} }
if (!strcmp(config, "syslog"))
{
gkrellm_log_register(gkrellmd_syslog_log, gkrellmd_syslog_init,
gkrellmd_syslog_cleanup);
return 0;
}
#if !defined(WIN32) #if !defined(WIN32)
if (!strcmp(config, "detach") || !strcmp(config, "d")) if (!strcmp(config, "detach") || !strcmp(config, "d"))
{ {
@ -498,8 +582,11 @@ parse_config(gchar *config, gchar *arg)
return 0; return 0;
} }
#endif #endif
// All following options take one argument that should be passed in arg
if (!arg || !*arg) if (!arg || !*arg)
return -1; return -1;
if (!strcmp(config, "update-hz") || !strcmp(config, "u")) if (!strcmp(config, "update-hz") || !strcmp(config, "u"))
_GK.update_HZ = atoi(arg); _GK.update_HZ = atoi(arg);
else if (!strcmp(config, "port") || !strcmp(config, "P")) else if (!strcmp(config, "port") || !strcmp(config, "P"))
@ -531,6 +618,8 @@ parse_config(gchar *config, gchar *arg)
_GK.net_timer = g_strdup(arg); _GK.net_timer = g_strdup(arg);
else if (!strcmp(config, "debug-level") || !strcmp(config, "debug")) else if (!strcmp(config, "debug-level") || !strcmp(config, "debug"))
_GK.debug_level = (gint) strtoul(arg, NULL, 0); _GK.debug_level = (gint) strtoul(arg, NULL, 0);
else if (!strcmp(config, "logfile"))
gkrellm_log_set_filename(arg);
#if !defined(WIN32) #if !defined(WIN32)
else if (!strcmp(config, "pidfile")) else if (!strcmp(config, "pidfile"))
_GK.pidfile = g_strdup(arg); _GK.pidfile = g_strdup(arg);
@ -565,9 +654,11 @@ load_config(gchar *path)
{ {
FILE *f; FILE *f;
PluginConfigRec *cfg; PluginConfigRec *cfg;
gchar buf[128], config[32], arg[128]; gchar buf[128+32+2], config[32], arg[128];
gchar *s, *plugin_config_block = NULL; gchar *s, *plugin_config_block = NULL;
//g_print("Trying to load config from file '%s'\n", path);
f = fopen(path, "r"); f = fopen(path, "r");
if (!f) if (!f)
return; return;
@ -640,6 +731,9 @@ static void
read_config(void) read_config(void)
{ {
gchar *path; gchar *path;
#if defined(WIN32)
gchar *install_path;
#endif
_GK.update_HZ = 3; _GK.update_HZ = 3;
_GK.debug_level = 0; _GK.debug_level = 0;
@ -651,25 +745,37 @@ read_config(void)
_GK.inet_interval = 1; _GK.inet_interval = 1;
#if defined(GKRELLMD_SYS_ETC) #if defined(GKRELLMD_SYS_ETC)
path = g_strdup_printf("%s/%s", GKRELLMD_SYS_ETC, GKRELLMD_CONFIG); path = g_build_filename(GKRELLMD_SYS_ETC, GKRELLMD_CONFIG, NULL);
load_config(path); load_config(path);
g_free(path); g_free(path);
#endif #endif
#if defined(GKRELLMD_LOCAL_ETC) #if defined(GKRELLMD_LOCAL_ETC)
path = g_strdup_printf("%s/%s", GKRELLMD_LOCAL_ETC, GKRELLMD_CONFIG); path = g_build_filename(GKRELLMD_LOCAL_ETC, GKRELLMD_CONFIG, NULL);
load_config(path); load_config(path);
g_free(path); g_free(path);
#endif #endif
_GK.homedir = (gchar *) g_get_home_dir(); // on windows also load config from INSTALLDIR/etc/gkrellmd.conf
if (!_GK.homedir) #if defined(WIN32)
_GK.homedir = "."; #if GLIB_CHECK_VERSION(2,16,0)
#if !defined(WIN32) install_path = g_win32_get_package_installation_directory_of_module(NULL);
path = g_strdup_printf("%s/.%s", _GK.homedir, GKRELLMD_CONFIG); path = g_build_filename(install_path, "etc", GKRELLMD_CONFIG, NULL);
#else #else
path = g_strdup_printf("%s/%s", _GK.homedir, GKRELLMD_CONFIG); // deprecated since glib 2.16
install_path = g_win32_get_package_installation_subdirectory(NULL, NULL, "etc");
path = g_build_filename(install_path, GKRELLMD_CONFIG, NULL);
#endif #endif
load_config(path);
g_free(install_path);
g_free(path);
#endif
_GK.homedir = (gchar *) g_get_home_dir();
if (_GK.homedir == NULL)
_GK.homedir = "."; // FIXME: doesn't look right to me
path = g_build_filename(_GK.homedir, GKRELLMD_USER_CONFIG, NULL);
load_config(path); load_config(path);
g_free(path); g_free(path);
} }
@ -679,54 +785,55 @@ usage(void)
{ {
#if defined(WIN32) #if defined(WIN32)
_tprintf(_("usage: gkrellmd command [options]\n")); g_print(_("usage: gkrellmd command [options]\n"));
_tprintf(_("commands:\n")); g_print(_("commands:\n"));
_tprintf(_(" --console run gkrellmd on console (not as a service)\n")); g_print(_(" --console run gkrellmd on console (not as a service)\n"));
_tprintf(_(" --install install gkrellmd service and exit\n")); g_print(_(" --install install gkrellmd service and exit\n"));
_tprintf(_(" --uninstall uninstall gkrellmd service and exit\n")); g_print(_(" --uninstall uninstall gkrellmd service and exit\n"));
_tprintf(_(" -h, --help display this help and exit\n")); g_print(_(" -h, --help display this help and exit\n"));
_tprintf(_(" -v, --version output version information and exit\n")); g_print(_(" -v, --version output version information and exit\n"));
_tprintf(_("options (only for command '--console'):\n")); g_print(_("options (only for command '--console'):\n"));
_tprintf(_(" -u, --update-hz F Monitor update frequency\n")); g_print(_(" -u, --update-hz F Monitor update frequency\n"));
_tprintf(_(" -m, --max-clients N Number of simultaneous clients\n")); g_print(_(" -m, --max-clients N Number of simultaneous clients\n"));
_tprintf(_(" -A, --address A Address of network interface to listen on\n")); g_print(_(" -A, --address A Address of network interface to listen on\n"));
_tprintf(_(" -P, --port P Server port to listen on\n")); g_print(_(" -P, --port P Server port to listen on\n"));
_tprintf(_(" -a, --allow-host host Allow connections from specified hosts\n")); g_print(_(" -a, --allow-host host Allow connections from specified hosts\n"));
_tprintf(_(" -c, --clear-hosts Clears the current list of allowed hosts\n")); g_print(_(" -c, --clear-hosts Clears the current list of allowed hosts\n"));
_tprintf(_(" --io-timeout N Close connection after N seconds of no I/O\n")); g_print(_(" --io-timeout N Close connection after N seconds of no I/O\n"));
_tprintf(_(" --reconnect-timeout N Try to connect every N seconds after\n" g_print(_(" --reconnect-timeout N Try to connect every N seconds after\n"
" a disconnect\n")); " a disconnect\n"));
_tprintf(_(" -p, --plugin name Enable a command line plugin\n")); g_print(_(" -p, --plugin name Enable a command line plugin\n"));
_tprintf(_(" -pe, --plugin-enable name Enable an installed plugin\n")); g_print(_(" -pe, --plugin-enable name Enable an installed plugin\n"));
_tprintf(_(" --plist List plugins and exit\n")); g_print(_(" --plist List plugins and exit\n"));
_tprintf(_(" --plog Print plugin install log\n")); g_print(_(" --plog Print plugin install log\n"));
_tprintf(_(" -V, --verbose increases the verbosity of gkrellmd\n")); g_print(_(" -V, --verbose increases the verbosity of gkrellmd\n"));
g_print(_(" -d, --debug-level n Turn debugging on for selective code sections.\n"));
#else #else
printf(_("usage: gkrellmd [options]\n")); g_print(_("usage: gkrellmd [options]\n"));
printf(_("options:\n")); g_print(_("options:\n"));
printf(_(" -u, --update-hz F Monitor update frequency\n")); g_print(_(" -u, --update-hz F Monitor update frequency\n"));
printf(_(" -m, --max-clients N Number of simultaneous clients\n")); g_print(_(" -m, --max-clients N Number of simultaneous clients\n"));
printf(_(" -A, --address A Address of network interface to listen on\n")); g_print(_(" -A, --address A Address of network interface to listen on\n"));
printf(_(" -P, --port P Server port to listen on\n")); g_print(_(" -P, --port P Server port to listen on\n"));
printf(_(" -a, --allow-host host Allow connections from specified hosts\n")); g_print(_(" -a, --allow-host host Allow connections from specified hosts\n"));
printf(_(" -c, --clear-hosts Clears the current list of allowed hosts\n")); g_print(_(" -c, --clear-hosts Clears the current list of allowed hosts\n"));
printf(_(" --io-timeout N Close connection after N seconds of no I/O\n")); g_print(_(" --io-timeout N Close connection after N seconds of no I/O\n"));
printf(_(" --reconnect-timeout N Try to connect every N seconds after\n" g_print(_(" --reconnect-timeout N Try to connect every N seconds after\n"
" a disconnect\n")); " a disconnect\n"));
printf(_(" --mailbox path Send local mailbox counts to gkrellm clients.\n")); g_print(_(" --mailbox path Send local mailbox counts to gkrellm clients.\n"));
printf(_(" -d, --detach Run in background and detach from terminal\n")); g_print(_(" -d, --detach Run in background and detach from terminal\n"));
printf(_(" -U, --user username Change to this username after startup\n")); g_print(_(" -U, --user username Change to this username after startup\n"));
printf(_(" -G, --group groupname Change to this group after startup\n")); g_print(_(" -G, --group groupname Change to this group after startup\n"));
printf(_(" -p, --plugin name Enable a command line plugin\n")); g_print(_(" -p, --plugin name Enable a command line plugin\n"));
printf(_(" -pe, --plugin-enable name Enable an installed plugin\n")); g_print(_(" -pe, --plugin-enable name Enable an installed plugin\n"));
printf(_(" --plist List plugins and exit\n")); g_print(_(" --plist List plugins and exit\n"));
printf(_(" --plog Print plugin install log\n")); g_print(_(" --plog Print plugin install log\n"));
printf(_(" --pidfile path Create a PID file\n")); g_print(_(" --pidfile path Create a PID file\n"));
printf(_(" -V, --verbose increases the verbosity of gkrellmd\n")); g_print(_(" -V, --verbose increases the verbosity of gkrellmd\n"));
printf(_(" -h, --help display this help and exit\n")); g_print(_(" -h, --help display this help and exit\n"));
printf(_(" -v, --version output version information and exit\n")); g_print(_(" -v, --version output version information and exit\n"));
#endif #endif
} }
@ -734,53 +841,44 @@ usage(void)
static void static void
get_args(gint argc, gchar **argv) get_args(gint argc, gchar **argv)
{ {
gchar *opt, *arg; gchar *s;
gint i, r; gint i, r;
for (i = 1; i < argc; ++i) for (i = 1; i < argc; ++i)
{ {
opt = argv[i]; s = argv[i];
arg = argv[i + 1]; if (*s == '-')
if (*opt == '-')
{ {
++opt; ++s;
if (*opt == '-') if (*s == '-')
++opt; ++s;
} }
if (!strcmp(opt, "verbose") || !strcmp(opt, "V"))
{ if (!strcmp(s, "verbose") || !strcmp(s, "V"))
_GK.verbose += 1; _GK.verbose += 1;
continue; else if (!strcmp(s, "plist"))
}
if (!strcmp(opt, "plist"))
{
_GK.list_plugins = TRUE; _GK.list_plugins = TRUE;
continue; else if (!strcmp(s, "plog"))
}
if (!strcmp(opt, "plog"))
{
_GK.log_plugins = TRUE; _GK.log_plugins = TRUE;
continue;
}
#if !defined(WIN32) #if !defined(WIN32)
if (!strcmp(opt, "without-libsensors")) else if (!strcmp(s, "without-libsensors"))
{
_GK.without_libsensors = TRUE; _GK.without_libsensors = TRUE;
continue;
}
#endif /* !WIN32 */ #endif /* !WIN32 */
else if ((!strcmp(s, "debug-level") || !strcmp(s, "d")) && i < argc - 1)
_GK.debug_level = (gint) strtoul(argv[++i], NULL, 0);
else if ( i < argc else if ( i < argc
&& ((r = parse_config(opt, (i < argc - 1) ? arg : NULL)) >= 0) && ((r = parse_config(s, (i < argc - 1) ? argv[i+1] : NULL)) >= 0)
) )
{ {
i += r; i += r;
continue;
} }
else
printf(_("Bad arg: %s\n"), argv[i]); {
g_print(_("Bad arg: %s\n"), argv[i]);
usage(); usage();
exit(0); exit(0);
} }
} // for()
} }
@ -812,7 +910,7 @@ socksetup(int af)
} }
if (error) if (error)
{ {
fprintf(stderr, "gkrellmd %s\n", gai_strerror(error)); g_warning("gkrellmd %s\n", gai_strerror(error));
return NULL; return NULL;
} }
#else #else
@ -842,8 +940,7 @@ socksetup(int af)
socks = malloc((maxs + 1) * sizeof(int)); socks = malloc((maxs + 1) * sizeof(int));
if (!socks) if (!socks)
{ {
fprintf(stderr, g_warning("Could not allocate memory for sockets\n");
"gkrellmd couldn't allocate memory for sockets\n");
return NULL; return NULL;
} }
@ -866,7 +963,7 @@ socksetup(int af)
#endif #endif
if (setsockopt(*s, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) < 0) if (setsockopt(*s, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) < 0)
{ {
fprintf(stderr, "gkrellmd setsockopt (SO_REUSEADDR) failed\n"); g_warning("gkrellmd: setsockopt (SO_REUSEADDR) failed\n");
close(*s); close(*s);
continue; continue;
} }
@ -879,7 +976,7 @@ socksetup(int af)
if (setsockopt(*s, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on)) < 0) if (setsockopt(*s, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on)) < 0)
{ {
fprintf(stderr, "gkrellmd setsockopt (IPV6_V6ONLY) failed\n"); g_warning("gkrellmd: setsockopt (IPV6_V6ONLY) failed\n");
close(*s); close(*s);
continue; continue;
} }
@ -901,7 +998,7 @@ socksetup(int af)
if (*socks == 0) if (*socks == 0)
{ {
fprintf(stderr, "gkrellmd couldn't bind to any socket\n"); g_warning("Could not bind to any socket\n");
free(socks); free(socks);
return NULL; return NULL;
} }
@ -935,7 +1032,7 @@ detach_from_terminal(void)
#if defined(HAVE_DAEMON) #if defined(HAVE_DAEMON)
if (daemon(0, 0)) if (daemon(0, 0))
{ {
fprintf(stderr, "gkrellmd detach failed: %s\n", strerror(errno)); g_warning("Detach failed: %s\n", strerror(errno));
return FALSE; return FALSE;
} }
#else #else
@ -945,7 +1042,7 @@ detach_from_terminal(void)
if (i < 0 || setsid() == -1) /* new session process group */ if (i < 0 || setsid() == -1) /* new session process group */
{ {
fprintf(stderr, "gkrellmd detach failed: %s\n", strerror(errno)); g_warning("Detach failed: %s\n", strerror(errno));
return FALSE; return FALSE;
} }
@ -1012,8 +1109,13 @@ gkrellmd_run(gint argc, gchar **argv)
read_config(); read_config();
get_args(argc, argv); get_args(argc, argv);
// first message that might get logged
g_message("Starting GKrellM Daemon %d.%d.%d%s\n", GKRELLMD_VERSION_MAJOR,
GKRELLMD_VERSION_MINOR, GKRELLMD_VERSION_REV,
GKRELLMD_EXTRAVERSION);
if (_GK.verbose) if (_GK.verbose)
printf("update_HZ=%d\n", _GK.update_HZ); g_print("update_HZ=%d\n", _GK.update_HZ);
#if defined(WIN32) #if defined(WIN32)
if (!service_is_one) if (!service_is_one)
@ -1039,9 +1141,7 @@ gkrellmd_run(gint argc, gchar **argv)
#endif /* defined(WIN32) */ #endif /* defined(WIN32) */
make_pidfile(); make_pidfile();
gkrellm_sys_main_init(); gkrellm_sys_main_init();
drop_privileges(); drop_privileges();
#if GLIB_CHECK_VERSION(2,0,0) #if GLIB_CHECK_VERSION(2,0,0)
@ -1063,7 +1163,7 @@ gkrellmd_run(gint argc, gchar **argv)
_GK.server_fd = socksetup(PF_UNSPEC); _GK.server_fd = socksetup(PF_UNSPEC);
if (_GK.server_fd == NULL) if (_GK.server_fd == NULL)
{ {
fprintf(stderr, "gkrellmd socket() failed: %s\n", strerror(errno)); g_warning("socket() failed: %s\n", strerror(errno));
gkrellmd_cleanup(); gkrellmd_cleanup();
return 1; return 1;
} }
@ -1085,7 +1185,7 @@ gkrellmd_run(gint argc, gchar **argv)
} }
if (listen_fds <= 0) if (listen_fds <= 0)
{ {
fprintf(stderr, "gkrellmd listen() failed: %s\n", strerror(errno)); g_warning("listen() failed: %s\n", strerror(errno));
gkrellmd_cleanup(); gkrellmd_cleanup();
return 1; return 1;
} }
@ -1117,7 +1217,7 @@ gkrellmd_run(gint argc, gchar **argv)
{ {
if (errno == EINTR) if (errno == EINTR)
continue; continue;
fprintf(stderr, "gkrellmd select() failed: %s\n", strerror(errno)); g_warning("select() failed: %s\n", strerror(errno));
gkrellmd_cleanup(); gkrellmd_cleanup();
return 1; return 1;
} }
@ -1150,7 +1250,7 @@ gkrellmd_run(gint argc, gchar **argv)
(socklen_t *) (void *)&addr_len); (socklen_t *) (void *)&addr_len);
if (client_fd == -1) if (client_fd == -1)
{ {
fprintf(stderr, "gkrellmd accept() failed: %s\n", g_warning("accept() failed: %s\n",
strerror(errno)); strerror(errno));
gkrellmd_cleanup(); gkrellmd_cleanup();
return 1; return 1;
@ -1166,16 +1266,18 @@ gkrellmd_run(gint argc, gchar **argv)
} }
FD_SET(client_fd, &read_fds); FD_SET(client_fd, &read_fds);
gkrellmd_serve_setup(client); gkrellmd_serve_setup(client);
if (_GK.verbose)
{ g_message(_("Accepted client %s:%u\n"),
printf("gkrellmd accepted client: %s:%u\n",
client->hostname, client->hostname,
ntohs(((struct sockaddr_in *)&client_addr)->sin_port)); ntohs(((struct sockaddr_in *)&client_addr)->sin_port));
} }
}
else else
{ {
#if defined(WIN32)
ioctlsocket(fd, FIONREAD, &nbytes);
#else
ioctl(fd, FIONREAD, &nbytes); ioctl(fd, FIONREAD, &nbytes);
#endif
if (nbytes == 0) if (nbytes == 0)
{ {
remove_client(fd); remove_client(fd);
@ -1186,7 +1288,7 @@ gkrellmd_run(gint argc, gchar **argv)
} }
} }
gkrellmd_update_monitors(); gkrellmd_update_monitors();
} /* while(1) */ } // while(1)
return 0; return 0;
} // gkrellmd_main() } // gkrellmd_main()
@ -1198,7 +1300,6 @@ static void service_update_status(DWORD newState)
SetServiceStatus(service_status_handle, &service_status); SetServiceStatus(service_status_handle, &service_status);
} }
void WINAPI service_control_handler(DWORD controlCode) void WINAPI service_control_handler(DWORD controlCode)
{ {
switch (controlCode) switch (controlCode)
@ -1214,9 +1315,11 @@ void WINAPI service_control_handler(DWORD controlCode)
} }
} }
void WINAPI service_main(DWORD argc, WCHAR* argv[])
void WINAPI service_main(DWORD argc, TCHAR* argv[])
{ {
gchar **argv_utf8;
DWORD i;
/* Init service status */ /* Init service status */
service_status.dwServiceType = SERVICE_WIN32; service_status.dwServiceType = SERVICE_WIN32;
service_status.dwCurrentState = SERVICE_STOPPED; service_status.dwCurrentState = SERVICE_STOPPED;
@ -1226,43 +1329,59 @@ void WINAPI service_main(DWORD argc, TCHAR* argv[])
service_status.dwCheckPoint = 0; service_status.dwCheckPoint = 0;
service_status.dwWaitHint = 0; service_status.dwWaitHint = 0;
service_status_handle = RegisterServiceCtrlHandler(service_name, service_control_handler); service_status_handle = RegisterServiceCtrlHandlerW(service_name, service_control_handler);
if (service_status_handle) if (service_status_handle)
{ {
/* service is starting */ // convert all strings in argv pointer array from utf16 to utf8
argv_utf8 = g_malloc(argc * sizeof(gchar *));
for (i = 0; i < argc; i++)
argv_utf8[i] = g_utf16_to_utf8(argv[i], -1, NULL, NULL, NULL);
// service is starting
service_update_status(SERVICE_START_PENDING); service_update_status(SERVICE_START_PENDING);
/* service is running */ // service is running
service_status.dwControlsAccepted |= (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN); service_status.dwControlsAccepted |= (SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN);
service_update_status(SERVICE_RUNNING); service_update_status(SERVICE_RUNNING);
service_running = TRUE; service_running = TRUE;
/*
gkrellmd_main returns on error or as soon as
service_running is FALSE (see service_control_handler())
*/
gkrellmd_run(argc, argv);
/* service was stopped */ // gkrellmd_main returns on error or as soon as
// service_running is FALSE (see service_control_handler())
gkrellmd_run(argc, argv_utf8);
// service was stopped
service_update_status(SERVICE_STOP_PENDING); service_update_status(SERVICE_STOP_PENDING);
/* service is now stopped */ // services are not stopped via process signals so we have to
// clean up like in cb_sigterm() but without calling exit()!
g_message("GKrellM Daemon %d.%d.%d%s: Exiting normally\n",
GKRELLMD_VERSION_MAJOR, GKRELLMD_VERSION_MINOR,
GKRELLMD_VERSION_REV, GKRELLMD_EXTRAVERSION);
gkrellmd_cleanup();
// free all strings in pointer array and free the array itself
for (i = 0; i < argc; i++)
g_free(argv_utf8[i]);
g_free(argv_utf8);
// service is now stopped
service_status.dwControlsAccepted &= ~(SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN); service_status.dwControlsAccepted &= ~(SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN);
service_update_status(SERVICE_STOPPED); service_update_status(SERVICE_STOPPED);
}
}
// process is automatically terminated by windows now
}
}
void service_run() void service_run()
{ {
SERVICE_TABLE_ENTRY serviceTable[] = SERVICE_TABLE_ENTRYW service_table[] =
{ {service_name, service_main}, { 0, 0 } }; { {service_name, service_main}, { 0, 0 } };
service_is_one = TRUE; service_is_one = TRUE;
/* Blocking system call, will return if service is not needed anymore */ // Blocking system call, will return if service is not needed anymore
StartServiceCtrlDispatcher(serviceTable); StartServiceCtrlDispatcherW(service_table);
} }
static gboolean service_wait_for_stop(SC_HANDLE serviceHandle) static gboolean service_wait_for_stop(SC_HANDLE serviceHandle)
{ {
static const gulong waitTimeoutSec = 30; static const gulong waitTimeoutSec = 30;
@ -1272,7 +1391,7 @@ static gboolean service_wait_for_stop(SC_HANDLE serviceHandle)
if (!QueryServiceStatus(serviceHandle, &status)) if (!QueryServiceStatus(serviceHandle, &status))
{ {
_tprintf("Could not query status of %s (%d)\n", service_display_name, GetLastError()); g_warning("Could not query status of %ls (%ld)\n", service_display_name, GetLastError());
return FALSE; return FALSE;
} }
waitTimer = g_timer_new(); /* create and start */ waitTimer = g_timer_new(); /* create and start */
@ -1281,7 +1400,7 @@ static gboolean service_wait_for_stop(SC_HANDLE serviceHandle)
g_usleep(status.dwWaitHint * 1000); g_usleep(status.dwWaitHint * 1000);
if (!QueryServiceStatus(serviceHandle, &status)) if (!QueryServiceStatus(serviceHandle, &status))
{ {
_tprintf("Could not query status of %s (%d)\n", service_display_name, GetLastError()); g_warning("Could not query status of %ls (%ld)\n", service_display_name, GetLastError());
ret = FALSE; ret = FALSE;
break; break;
} }
@ -1292,7 +1411,7 @@ static gboolean service_wait_for_stop(SC_HANDLE serviceHandle)
} }
if (g_timer_elapsed(waitTimer, NULL) > waitTimeoutSec) if (g_timer_elapsed(waitTimer, NULL) > waitTimeoutSec)
{ {
_tprintf(_("Stopping %s timed out\n"), service_display_name); g_warning("Stopping %ls timed out\n", service_display_name);
ret = FALSE; ret = FALSE;
break; break;
} }
@ -1307,13 +1426,13 @@ static gboolean service_stop(SC_HANDLE serviceHandle)
SERVICE_STATUS svcStatus; SERVICE_STATUS svcStatus;
if (!QueryServiceStatus(serviceHandle, &svcStatus)) if (!QueryServiceStatus(serviceHandle, &svcStatus))
{ {
_tprintf("Could not query status of %s (%d)\n", service_display_name, GetLastError()); g_warning("Could not query status of %ls (%ld)\n", service_display_name, GetLastError());
return FALSE; return FALSE;
} }
/* service not running at all, just return that stopping worked out */ /* service not running at all, just return that stopping worked out */
if (svcStatus.dwCurrentState == SERVICE_STOPPED) if (svcStatus.dwCurrentState == SERVICE_STOPPED)
{ {
_tprintf(_("%s already stopped\n"), service_display_name); g_print(_("%ls already stopped\n"), service_display_name);
return TRUE; return TRUE;
} }
/* service already stopping, just wait for its exit */ /* service already stopping, just wait for its exit */
@ -1324,7 +1443,7 @@ static gboolean service_stop(SC_HANDLE serviceHandle)
/* Service is running, let's stop it */ /* Service is running, let's stop it */
if (!ControlService(serviceHandle, SERVICE_CONTROL_STOP, &svcStatus)) if (!ControlService(serviceHandle, SERVICE_CONTROL_STOP, &svcStatus))
{ {
_tprintf(_("Could not stop %s (%d)\n"), service_display_name, GetLastError()); g_warning(_("Could not stop %ls (%ld)\n"), service_display_name, GetLastError());
return FALSE; return FALSE;
} }
// Wait for the service to stop. // Wait for the service to stop.
@ -1338,51 +1457,62 @@ static gboolean service_stop(SC_HANDLE serviceHandle)
static gboolean service_install() static gboolean service_install()
{ {
TCHAR path[_MAX_PATH + 1]; WCHAR path[_MAX_PATH + 1];
SC_HANDLE scmHandle; SC_HANDLE scmHandle;
SC_HANDLE svcHandle; SC_HANDLE svcHandle;
DWORD err; DWORD err;
if (GetModuleFileName(0, path, sizeof(path)/sizeof(path[0])) < 1) g_print(_("Installing %ls...\n"), service_display_name);
if (GetModuleFileNameW(0, path, sizeof(path)/sizeof(path[0])) < 1)
{ {
_tprintf(_("Could not determine path to gkrellmd service binary (%d)\n"), GetLastError()); g_warning("Could not determine path to gkrellmd service binary, error 0x%ld\n", GetLastError());
return FALSE; return FALSE;
} }
scmHandle = OpenSCManager(NULL, NULL, SC_MANAGER_CREATE_SERVICE); scmHandle = OpenSCManagerW(NULL, NULL, SC_MANAGER_CREATE_SERVICE);
if (!scmHandle) if (!scmHandle)
{ {
err = GetLastError(); err = GetLastError();
if (err == ERROR_ACCESS_DENIED) if (err == ERROR_ACCESS_DENIED)
_tprintf(_("Could not connect to service manager, access denied\n")); g_warning("Could not connect to service manager, access denied\n");
else else
_tprintf(_("Could not connect to service manager (%d)\n"), err); g_warning("Could not connect to service manager, error 0x%lXd\n", err);
return FALSE; return FALSE;
} }
svcHandle = CreateService(scmHandle, service_name, service_display_name, svcHandle = CreateServiceW(scmHandle, service_name, service_display_name,
SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START,
SERVICE_ERROR_NORMAL, path, 0, 0, 0, 0, 0); SERVICE_ERROR_NORMAL, path, 0, 0, 0, 0, 0);
if (!svcHandle) if (!svcHandle)
{ {
err = GetLastError(); err = GetLastError();
if (err == ERROR_ACCESS_DENIED) if (err == ERROR_ACCESS_DENIED)
_tprintf(_("Could not create %s, access denied\n"), service_display_name); g_warning("Could not install %ls, access denied\n", service_display_name);
else if (err == ERROR_SERVICE_EXISTS || err == ERROR_DUPLICATE_SERVICE_NAME) else if (err == ERROR_SERVICE_EXISTS || err == ERROR_DUPLICATE_SERVICE_NAME)
_tprintf(_("Could not create %s, a service of the same name already exists\n"), service_display_name); g_warning("Could not install %ls, a service of the same name already exists\n", service_display_name);
else else
_tprintf(_("Could not create %s, error %d\n"), service_display_name, err); g_warning("Could not install %ls, error 0x%lX\n", service_display_name, err);
CloseServiceHandle(scmHandle); CloseServiceHandle(scmHandle);
return FALSE; return FALSE;
} }
else
{
g_print(_("%ls has been installed.\n"), service_display_name);
}
if (!StartService(svcHandle, 0, NULL)) g_print(_("Starting %ls...\n"), service_display_name);
if (!StartServiceW(svcHandle, 0, NULL))
{ {
err = GetLastError(); err = GetLastError();
if (err == ERROR_ACCESS_DENIED) if (err == ERROR_ACCESS_DENIED)
_tprintf(_("Could not start %s, access denied\n"), service_display_name); g_warning("Could not start %ls, access denied\n", service_display_name);
else else
_tprintf(_("Could not start %s (%d)\n"), service_display_name, GetLastError()); g_warning("Could not start %ls, error 0x%lX\n", service_display_name, err);
}
else
{
g_print(_("%ls has been started.\n"), service_display_name);
} }
CloseServiceHandle(svcHandle); CloseServiceHandle(svcHandle);
@ -1395,38 +1525,49 @@ static gboolean service_uninstall()
{ {
SC_HANDLE scmHandle; SC_HANDLE scmHandle;
SC_HANDLE svcHandle; SC_HANDLE svcHandle;
BOOL delRet; BOOL delRet = FALSE;
DWORD err; gchar *errmsg;
scmHandle = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT); g_print(_("Uninstalling %ls...\n"), service_display_name);
scmHandle = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT);
if (!scmHandle) if (!scmHandle)
{ {
_tprintf(_("Could not connect to service manager (%d)\n"), GetLastError()); errmsg = g_win32_error_message(GetLastError());
g_warning("Could not connect to service manager: %s\n", errmsg);
g_free(errmsg);
return FALSE; return FALSE;
} }
svcHandle = OpenService(scmHandle, service_name, SERVICE_STOP | SERVICE_QUERY_STATUS | DELETE);
svcHandle = OpenServiceW(scmHandle, service_name,
SERVICE_STOP | SERVICE_QUERY_STATUS | DELETE);
if (!svcHandle) if (!svcHandle)
{ {
err = GetLastError(); errmsg = g_win32_error_message(GetLastError());
if (err == ERROR_ACCESS_DENIED) g_warning("Could not open %ls: %s\n", service_display_name, errmsg);
_tprintf(_("Access to %s denied\n"), service_display_name); g_free(errmsg);
else if (err == ERROR_SERVICE_DOES_NOT_EXIST) }
_tprintf(_("%s is not installed\n"), service_display_name);
else else
_tprintf(_("Could not open %s, error %d\n"), service_display_name, GetLastError());
CloseServiceHandle(scmHandle);
return FALSE;
}
if (!service_stop(svcHandle))
{ {
CloseServiceHandle(svcHandle); // handle to gkrellm service aquired, now stop and uninstall it
CloseServiceHandle(scmHandle); if (service_stop(svcHandle))
return FALSE; {
}
delRet = DeleteService(svcHandle); delRet = DeleteService(svcHandle);
if (!delRet)
{
errmsg = g_win32_error_message(GetLastError());
g_warning("Could not uninstall %ls: %s\n",
service_display_name, errmsg);
g_free(errmsg);
}
else
{
g_print(_("%ls has been uninstalled.\n"), service_display_name);
}
}
CloseServiceHandle(svcHandle); CloseServiceHandle(svcHandle);
}
CloseServiceHandle(scmHandle); CloseServiceHandle(scmHandle);
return delRet ? TRUE : FALSE; return delRet ? TRUE : FALSE;
@ -1481,7 +1622,10 @@ int main(int argc, char* argv[])
bind_textdomain_codeset(PACKAGE_D, "UTF-8"); bind_textdomain_codeset(PACKAGE_D, "UTF-8");
#endif /* ENABLE_NLS */ #endif /* ENABLE_NLS */
/* Parse arguments for actions which exit gkrellmd immediately */ // Init logging-chain
gkrellm_log_init();
/* Parse arguments for actions that exit gkrellmd immediately */
for (i = 1; i < argc; ++i) for (i = 1; i < argc; ++i)
{ {
opt = argv[i]; opt = argv[i];
@ -1499,7 +1643,7 @@ int main(int argc, char* argv[])
} }
else if (!strcmp(opt, "version") || !strcmp(opt, "v")) else if (!strcmp(opt, "version") || !strcmp(opt, "v"))
{ {
printf("gkrellmd %d.%d.%d%s\n", GKRELLMD_VERSION_MAJOR, g_print("gkrellmd %d.%d.%d%s\n", GKRELLMD_VERSION_MAJOR,
GKRELLMD_VERSION_MINOR, GKRELLMD_VERSION_REV, GKRELLMD_VERSION_MINOR, GKRELLMD_VERSION_REV,
GKRELLMD_EXTRAVERSION); GKRELLMD_EXTRAVERSION);
return 0; return 0;
@ -1507,19 +1651,11 @@ int main(int argc, char* argv[])
#if defined(WIN32) #if defined(WIN32)
else if (!strcmp(opt, "install")) else if (!strcmp(opt, "install"))
{ {
_tprintf(_("Installing %s...\n"), service_display_name); return (service_install() ? 1 : 0);
if (!service_install())
return 1;
_tprintf(_("%s has been installed.\n"), service_display_name);
return 0;
} }
else if (!strcmp(opt, "uninstall")) else if (!strcmp(opt, "uninstall"))
{ {
_tprintf(_("Uninstalling %s...\n"), service_display_name); return (service_uninstall() ? 1 : 0);
if (!service_uninstall())
return 1;
_tprintf(_("%s has been uninstalled.\n"), service_display_name);
return 0;
} }
else if (!strcmp(opt, "console")) else if (!strcmp(opt, "console"))
{ {
@ -1543,14 +1679,14 @@ int main(int argc, char* argv[])
return retVal; return retVal;
} }
#endif /* defined(WIN32) */ #endif /* defined(WIN32) */
} /* for() */ }
#if defined(WIN32) #if defined(WIN32)
/* Win: register service and wait for the service to be started/stopped */ // win32: register service and wait for the service to be started/stopped
service_run(); service_run();
return 0; return 0;
#else #else
/* Unix: just enter main loop */ // Unix: just enter main loop
return gkrellmd_run(argc, argv); return gkrellmd_run(argc, argv);
#endif #endif
} /* main() */ }

2
server/sysdeps-unix.c
View File

@ -76,7 +76,6 @@
#include <sys/utsname.h> #include <sys/utsname.h>
#endif #endif
#if !defined(WIN32)
gchar * gchar *
gkrellm_sys_get_host_name(void) gkrellm_sys_get_host_name(void)
{ {
@ -89,6 +88,7 @@ gkrellm_sys_get_host_name(void)
return buf; return buf;
} }
#if !defined(WIN32)
gchar * gchar *
gkrellm_sys_get_system_name(void) gkrellm_sys_get_system_name(void)
{ {