projects
/
fms.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version 0.3.8
[fms.git]
/
src
/
fmsapp.cpp
diff --git
a/src/fmsapp.cpp
b/src/fmsapp.cpp
index
94443c4
..
ebebe4a
100644
(file)
--- a/
src/fmsapp.cpp
+++ b/
src/fmsapp.cpp
@@
-17,6
+17,8
@@
#include <Poco/FormattingChannel.h>
\r
#include <Poco/PatternFormatter.h>
\r
#include <iostream>
\r
#include <Poco/FormattingChannel.h>
\r
#include <Poco/PatternFormatter.h>
\r
#include <iostream>
\r
+#include <string>
\r
+#include <cstring>
\r
\r
#ifdef _WIN32
\r
#include <direct.h>
\r
\r
#ifdef _WIN32
\r
#include <direct.h>
\r
@@
-99,7
+101,8
@@
void FMSApp::initialize(Poco::Util::Application &self)
ServerApplication::initialize(self);
\r
\r
// set working directory - fall back on application.dir if working directory isn't set
\r
ServerApplication::initialize(self);
\r
\r
// set working directory - fall back on application.dir if working directory isn't set
\r
- if(m_workingdirectory=="")
\r
+ // if we are runing as a service, then working directory needs to be set to the application directory
\r
+ if(m_workingdirectory=="" || config().getBool("application.runAsService",false)==true)
\r
{
\r
m_workingdirectory=config().getString("application.dir");
\r
}
\r
{
\r
m_workingdirectory=config().getString("application.dir");
\r
}
\r