1
0
Fork 0

Merge pull request #89 from phl0/noLog

No log
ycs232-kbc
Jonathan Naylor 7 years ago committed by GitHub
commit cc0bbd76f1

4
.gitignore vendored

@ -1,7 +1,6 @@
Debug Debug
Release Release
x64 x64
MMDVMHost
*.o *.o
*.opendb *.opendb
*.bak *.bak
@ -14,3 +13,6 @@ MMDVMHost
*.user *.user
*.VC.db *.VC.db
.vs .vs
YSFGateway/YSFGateway
YSFParrot/YSFParrot
YSFReflector/YSFReflector

@ -32,16 +32,22 @@
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
if (argc == 1) { if (argc == 1) {
::fprintf(stderr, "Usage: YSFParrot [-d|--debug] <port>\n"); ::fprintf(stderr, "Usage: YSFParrot [-d|--debug] [-n|--nolog] <port>\n");
return 1; return 1;
} }
unsigned int n = 1U; int n = 1U;
bool debug = false; bool debug = false;
if (::strcmp(argv[1], "-d") == 0 || ::strcmp(argv[1], "--debug") == 0) { bool log = true;
for (; n < argc-1; n++) {
if (::strcmp(argv[n], "-d") == 0 || ::strcmp(argv[n], "--debug") == 0) {
debug = true; debug = true;
n = 2U; }
if (::strcmp(argv[n], "-n") == 0 || ::strcmp(argv[n], "--nolog") == 0) {
log = false;
}
} }
unsigned int port = ::atoi(argv[n]); unsigned int port = ::atoi(argv[n]);
@ -50,15 +56,16 @@ int main(int argc, char** argv)
return 1; return 1;
} }
CYSFParrot parrot(port, debug); CYSFParrot parrot(port, debug, log);
parrot.run(); parrot.run();
return 0; return 0;
} }
CYSFParrot::CYSFParrot(unsigned int port, bool debug) : CYSFParrot::CYSFParrot(unsigned int port, bool debug, bool log) :
m_port(port), m_port(port),
m_debug(debug) m_debug(debug),
m_log(log)
{ {
} }
@ -68,12 +75,19 @@ CYSFParrot::~CYSFParrot()
void CYSFParrot::run() void CYSFParrot::run()
{ {
bool ret = ::LogInitialise(".", "YSFParrot", m_debug ? 1U : 2U, m_debug ? 1U : 2U); int fileLevel = 0U;
if (m_log) {
fileLevel = m_debug ? 1U : 2U;
}
bool ret = ::LogInitialise(".", "YSFParrot", fileLevel, m_debug ? 1U : 2U);
if (!ret) { if (!ret) {
::fprintf(stderr, "YSFParrot: unable to open the log file\n"); ::fprintf(stderr, "YSFParrot: unable to open the log file\n");
return; return;
} }
LogInfo("Debug: %s", m_debug ? "enabled" : "disabled");
LogInfo("Logging to file: %s", m_log ? "enabled" : "disabled");
CParrot parrot(180U); CParrot parrot(180U);
CNetwork network(m_port); CNetwork network(m_port);

@ -22,7 +22,7 @@
class CYSFParrot class CYSFParrot
{ {
public: public:
CYSFParrot(unsigned int port, bool debug); CYSFParrot(unsigned int port, bool debug, bool log);
~CYSFParrot(); ~CYSFParrot();
void run(); void run();
@ -30,6 +30,7 @@ public:
private: private:
unsigned int m_port; unsigned int m_port;
bool m_debug; bool m_debug;
bool m_log;
}; };
#endif #endif

Loading…
Cancel
Save