summaryrefslogtreecommitdiff
path: root/server-tools/instance-manager/WindowsService.cpp
diff options
context:
space:
mode:
authorunknown <reggie@ubuntu.(none)>2005-09-13 14:53:19 -0500
committerunknown <reggie@ubuntu.(none)>2005-09-13 14:53:19 -0500
commitc6dfe79beba3a4c03468d6e45aface45dfc38967 (patch)
tree9526667b98692215b3c525821064ff5229e93cd8 /server-tools/instance-manager/WindowsService.cpp
parent69b1940eefad9f9badbce78104a0fdc4780a05eb (diff)
downloadmariadb-git-c6dfe79beba3a4c03468d6e45aface45dfc38967.tar.gz
fixed the service bits of the IM
server-tools/instance-manager/IMService.cpp: * setting username and password to NULL so that the IM runs at LocalSystem (this should be changed soon) * implemented stop service by raising a sigterm * implemented start service by loading options and calling manager() server-tools/instance-manager/IMService.h: changed the sig for Run() server-tools/instance-manager/WindowsService.cpp: default debugging to false changed the sig of RuN() server-tools/instance-manager/WindowsService.h: change the sig of run() server-tools/instance-manager/instance.cc: * remove the inclusion of process.h * concat all args into a single buffer to pass to CreateProcess server-tools/instance-manager/instance_options.cc: quoting the binary to handle paths with quotes server-tools/instance-manager/listener.cc: use a timeval for select so that our select will only run for 100 msec before we check to see if we are shutting down server-tools/instance-manager/mysqlmanager.cc: if we are given the stand alone option, then run the manager as standalone server-tools/instance-manager/options.cc: Added stand alone command line arg server-tools/instance-manager/options.h: Added stand alone command line arg
Diffstat (limited to 'server-tools/instance-manager/WindowsService.cpp')
-rw-r--r--server-tools/instance-manager/WindowsService.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/server-tools/instance-manager/WindowsService.cpp b/server-tools/instance-manager/WindowsService.cpp
index fb7e00e0d9b..192045b7a4c 100644
--- a/server-tools/instance-manager/WindowsService.cpp
+++ b/server-tools/instance-manager/WindowsService.cpp
@@ -8,7 +8,8 @@ WindowsService::WindowsService(void) :
statusCheckpoint(0),
serviceName(NULL),
inited(false),
- dwAcceptedControls(SERVICE_ACCEPT_STOP)
+ dwAcceptedControls(SERVICE_ACCEPT_STOP),
+ debugging(false)
{
gService= this;
status.dwServiceType= SERVICE_WIN32_OWN_PROCESS;
@@ -148,7 +149,7 @@ void WindowsService::RegisterAndRun(DWORD argc, LPTSTR *argv)
{
statusHandle= ::RegisterServiceCtrlHandler(serviceName, ControlHandler);
if (statusHandle && ReportStatus(SERVICE_START_PENDING))
- Run();
+ Run(argc, argv);
ReportStatus(SERVICE_STOPPED);
}