diff options
| author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2012-08-06 14:47:18 +0200 |
|---|---|---|
| committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2012-08-06 14:47:18 +0200 |
| commit | 1ccf0958ece7fbfde3761207f3238719e0585105 (patch) | |
| tree | c2b2b0ba5bfedca8f793d35e5d3216e9c301cbf3 /src/account-server/main-account.cpp | |
| parent | 1bbf0a238b62f2c977800f539386df5af9424fff (diff) | |
| parent | af59c9d650bc254683618e7b334795e5a75886b2 (diff) | |
| download | manaserv-1ccf0958ece7fbfde3761207f3238719e0585105.tar.gz manaserv-1ccf0958ece7fbfde3761207f3238719e0585105.tar.bz2 manaserv-1ccf0958ece7fbfde3761207f3238719e0585105.tar.xz manaserv-1ccf0958ece7fbfde3761207f3238719e0585105.zip | |
Merge branch 'master' into lpc2012
Conflicts:
src/game-server/item.cpp
Diffstat (limited to 'src/account-server/main-account.cpp')
| -rw-r--r-- | src/account-server/main-account.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/account-server/main-account.cpp b/src/account-server/main-account.cpp index 65c5efd1..ab4df75e 100644 --- a/src/account-server/main-account.cpp +++ b/src/account-server/main-account.cpp @@ -365,19 +365,11 @@ int main(int argc, char *argv[]) statTimer.start(); banTimer.start(); - // ------------------------------------------------------------------------- - // FIXME: for testing purposes only... - // writing accountserver startup time and svn revision to database as global - // world state variable - const time_t startup = time(NULL); + // Write startup time to database as system world state variable std::stringstream timestamp; - timestamp << startup; + timestamp << time(NULL); storage->setWorldStateVar("accountserver_startup", timestamp.str(), Storage::SystemMap); - const std::string revision = "$Revision$"; - storage->setWorldStateVar("accountserver_version", revision, - Storage::SystemMap); - // ------------------------------------------------------------------------- while (running) { |