diff --git a/server/src/core/traintastic.cpp b/server/src/core/traintastic.cpp index 6bba73b2..09388060 100644 --- a/server/src/core/traintastic.cpp +++ b/server/src/core/traintastic.cpp @@ -112,7 +112,7 @@ bool Traintastic::run() return true; } -void Traintastic::shutdown() +void Traintastic::exit() { console->notice(id, "Shutting down"); diff --git a/server/src/core/traintastic.hpp b/server/src/core/traintastic.hpp index d20e6e6e..d65fdbd3 100644 --- a/server/src/core/traintastic.hpp +++ b/server/src/core/traintastic.hpp @@ -88,7 +88,7 @@ class Traintastic : public Object std::filesystem::path worldDir() const { return m_dataDir / "world"; } bool run(); - void shutdown(); + void exit(); }; #endif diff --git a/server/src/main.cpp b/server/src/main.cpp index f4e1e397..5881853a 100644 --- a/server/src/main.cpp +++ b/server/src/main.cpp @@ -47,7 +47,7 @@ void signalHandler(int signum) [signum]() { Traintastic::instance->console->notice(Traintastic::id, std::string("Received signal: ") + strsignal(signum)); - Traintastic::instance->shutdown(); + Traintastic::instance->exit(); }); break; } @@ -156,8 +156,13 @@ int main(int argc, char* argv[]) try { Traintastic::instance = std::make_shared(dataDir); + std::cerr << "before run" << std::endl; status = Traintastic::instance->run() ? EXIT_SUCCESS : EXIT_FAILURE; + std::cerr << "after run" << std::endl; + std::cerr << Traintastic::instance.use_count() << std::endl; Traintastic::instance.reset(); + std::cerr << Traintastic::instance.use_count() << std::endl; + std::cerr << "after reset" << std::endl; } catch(const std::exception& e) {