ps/hermes
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

ifdef out a few unix specifics for win32

Browse source
This commit is contained in:
ps 2011-01-17 20:56:31 +00:00
parent 2adab1b824
commit b5311dd121
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/hermes.cpp
View file

@ -234,6 +234,7 @@ main
// wait for all threads to finish // wait for all threads to finish
LINF("Waiting for threads to finish"); LINF("Waiting for threads to finish");
#ifndef WIN32
while(children.size()) while(children.size())
{ {
if(false==cfg.getBackground()) if(false==cfg.getBackground())
@ -243,11 +244,14 @@ main
} }
sleep(1); sleep(1);
} }
#endif //WIN32
if(cfg.getCleanDb()) if(cfg.getCleanDb())
pthread_join(cleaner_thread,NULL); pthread_join(cleaner_thread,NULL);
#ifndef WIN32
if(false==cfg.getBackground()) if(false==cfg.getBackground())
cout << endl; cout << endl;
#endif //WIN32
#ifdef HAVE_SPF #ifdef HAVE_SPF
Spf::deinitialize(); Spf::deinitialize();
@ -320,6 +324,7 @@ void *cleaner_thread_run(void *)
} }
next_run+=3600; next_run+=3600;
} }
#ifndef WIN32
if(false==cfg.getBackground()) if(false==cfg.getBackground())
{ {
if(!(now%10)) //echo info each 10 seconds if(!(now%10)) //echo info each 10 seconds
@ -335,6 +340,7 @@ void *cleaner_thread_run(void *)
cout << ss.str(); cout << ss.str();
} }
} }
#endif //WIN32
sleep(1); sleep(1);
} }
db.close(); db.close();
@ -375,7 +381,6 @@ void *thread_main(void *info_stack)
} }
catch(Exception &e) catch(Exception &e)
{ {
if(false==cfg.getBackground())
LDEB(e); LDEB(e);
} }
return NULL; return NULL;
@ -386,8 +391,10 @@ void exit_requested(int)
if(!quit) if(!quit)
{ {
quit=true; quit=true;
#ifndef WIN32
if(false==cfg.getBackground()) if(false==cfg.getBackground())
cout << "Hit control+c again to force-quit" << endl; cout << "Hit control+c again to force-quit" << endl;
#endif //WIN32
} }
else else
exit(-1); exit(-1);