hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improvements to connector shutdown code, attempted fix for Windows support.

Browse source
This commit is contained in:
Thulinma 2015-04-16 13:18:52 +02:00
parent 2e052fa2a1
commit d120523bbb
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/shared_memory.cpp
View file

@ -293,7 +293,7 @@ namespace IPC {
#ifdef __CYGWIN__ #ifdef __CYGWIN__
if (master) { if (master) {
//Under cygwin, all pages are 4 bytes longer than claimed. //Under cygwin, all pages are 4 bytes longer than claimed.
handle = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, len+4, name.c_str()); handle = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, 0, len+4, std::string("Global\\" + name).c_str());
} else { } else {
int i = 0; int i = 0;
do { do {

4
src/controller/controller_connectors.cpp
View file

@ -149,9 +149,13 @@ namespace Controller {
std::map<std::string, pid_t>::iterator it; std::map<std::string, pid_t>::iterator it;
for (it = currentConnectors.begin(); it != currentConnectors.end(); it++){ for (it = currentConnectors.begin(); it != currentConnectors.end(); it++){
if (!runningConns.count(it->first)){ if (!runningConns.count(it->first)){
if (Util::Procs::isActive(it->second)){
Log("CONF", "Stopping connector " + it->first); Log("CONF", "Stopping connector " + it->first);
Util::Procs::Stop(it->second); Util::Procs::Stop(it->second);
} }
currentConnectors.erase(it);
it = currentConnectors.begin();
}
} }
//start up new/changed connectors //start up new/changed connectors