From 56f2877d17b708455ba717e71af7700ba4677e46 Mon Sep 17 00:00:00 2001
From: ac_stef <ac_stef@users.sourceforge.net>
Date: Mon, 12 Jan 2009 18:24:40 +0000
Subject: [PATCH] more serverms logging

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4136 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/server.cpp   |  2 +-
 source/src/serverms.cpp | 18 +++++++-----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/source/src/server.cpp b/source/src/server.cpp
index 5ba03b86..07692d45 100644
--- a/source/src/server.cpp
+++ b/source/src/server.cpp
@@ -547,7 +547,7 @@ static string servdesc_full, servdesc_pre, servdesc_suf, servdesc_cur;
 ENetAddress servdesc_caller;
 bool custom_servdesc = false;
 
-bool isdedicated;
+bool isdedicated = false;
 ENetHost *serverhost = NULL;
 
 void process(ENetPacket *packet, int sender, int chan);
diff --git a/source/src/serverms.cpp b/source/src/serverms.cpp
index 67a477df..6789a229 100644
--- a/source/src/serverms.cpp
+++ b/source/src/serverms.cpp
@@ -3,6 +3,9 @@
 #include "pch.h"
 #include "cube.h"
 
+extern struct log *logger;
+extern bool isdedicated;
+
 #ifdef STANDALONE
 bool resolverwait(const char *name, ENetAddress *address)
 {
@@ -21,9 +24,7 @@ ENetSocket httpgetsend(ENetAddress &remoteaddress, const char *hostname, const c
 {
     if(remoteaddress.host==ENET_HOST_ANY)
     {
-#ifdef STANDALONE
-        printf("looking up %s...\n", hostname);
-#endif
+        if(isdedicated) logger->writeline(log::info, "looking up %s...", hostname);
         if(!resolverwait(hostname, &remoteaddress)) return ENET_SOCKET_NULL;
     }
     ENetSocket sock = enet_socket_create(ENET_SOCKET_TYPE_STREAM);
@@ -34,18 +35,14 @@ ENetSocket httpgetsend(ENetAddress &remoteaddress, const char *hostname, const c
     }
     if(sock==ENET_SOCKET_NULL || connectwithtimeout(sock, hostname, remoteaddress)<0)
     {
-#ifdef STANDALONE
-        printf(sock==ENET_SOCKET_NULL ? "could not open socket\n" : "could not connect\n");
-#endif
+        if(isdedicated) logger->writeline(log::info, sock==ENET_SOCKET_NULL ? "could not open socket" : "could not connect");
         return ENET_SOCKET_NULL;
     }
     ENetBuffer buf;
     s_sprintfd(httpget)("GET %s HTTP/1.0\nHost: %s\nReferer: %s\nUser-Agent: %s\n\n", req, hostname, ref, agent);
     buf.data = httpget;
     buf.dataLength = strlen((char *)buf.data);
-#ifdef STANDALONE
-    printf("sending request to %s...\n", hostname);
-#endif
+    if(isdedicated) logger->writeline(log::info, "sending request to %s...", hostname);
     enet_socket_send(sock, NULL, &buf, 1);
     return sock;
 }
@@ -107,8 +104,7 @@ void checkmasterreply()
         mssock = ENET_SOCKET_NULL;
         string text;
         filtertext(text, (const char *) stripheader(masterrep));
-        extern struct log *logger;
-        logger->writeline(log::info, "masterserver reply: %s\n", text);
+        logger->writeline(log::info, "masterserver reply: %s", text);
     }
 }