diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2013-08-08 09:19:36 -0400 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2013-08-08 09:19:36 -0400 |
| commit | 8a46452a700fa5a8d6fc3bd9308bf483cd715de1 (patch) | |
| tree | ef548e9fb3b2f715fed9f765120a4cc00c0a7abb /node/Service.cpp | |
| parent | 20f8668c286b2991f5eb1984dde6a8a76434d12d (diff) | |
| download | infinitytier-8a46452a700fa5a8d6fc3bd9308bf483cd715de1.tar.gz infinitytier-8a46452a700fa5a8d6fc3bd9308bf483cd715de1.zip | |
Move template parameter in Thread to a more logical scope location.
Diffstat (limited to 'node/Service.cpp')
| -rw-r--r-- | node/Service.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/node/Service.cpp b/node/Service.cpp index 0d4702f8..5806db13 100644 --- a/node/Service.cpp +++ b/node/Service.cpp @@ -62,7 +62,7 @@ Service::Service(const RuntimeEnvironment *renv,const char *name,const char *pat _childStderr(0), _run(true) { - _thread = Thread<Service>::start(this); + _thread = Thread::start(this); } Service::~Service() @@ -77,14 +77,14 @@ Service::~Service() pid = 0; break; } - Thread<Service>::sleep(100); + Thread::sleep(100); } if (pid > 0) { ::kill(pid,SIGKILL); waitpid(pid,&st,0); } } - Thread<Service>::join(_thread); + Thread::join(_thread); } bool Service::send(const Dictionary &msg) @@ -136,7 +136,7 @@ void Service::threadMain() close(in[0]); close(out[1]); close(err[1]); - Thread<Service>::sleep(500); // give child time to start + Thread::sleep(500); // give child time to start _childStdin = in[1]; _childStdout = out[0]; _childStderr = err[0]; @@ -168,7 +168,7 @@ void Service::threadMain() LOG("service %s exited with exit code: %d, delaying 1s to attempt relaunch",_name.c_str(),st); - Thread<Service>::sleep(1000); // wait to relaunch + Thread::sleep(1000); // wait to relaunch continue; } } |
