[Spice-commits] client/application.cpp server/reds.c

[Gerd Hoffmann]

 client/application.cpp |    2 +-
 server/reds.c          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d9084bfb64a59bb1c6c45228a5b475f36a6fffef
Author: Gerd Hoffmann <kraxel at redhat.com>
Date:   Wed May 19 12:09:22 2010 +0200

    Revert "[debug] migration troubleshooting"
    
    This reverts commit 08927fabe57c17086fe3bce3a9ca166e2309349e.

diff --git a/client/application.cpp b/client/application.cpp
index 74f5543..4eb8ac8 100644
--- a/client/application.cpp
+++ b/client/application.cpp
@@ -2110,7 +2110,7 @@ void Application::init_logger()
     }
 
     log4cpp::Category& root = log4cpp::Category::getRoot();
-#if 1 // RED_DEBUG
+#ifdef RED_DEBUG
     root.setPriority(log4cpp::Priority::DEBUG);
     root.removeAllAppenders();
     root.addAppender(new log4cpp::FileAppender("_", fd));
diff --git a/server/reds.c b/server/reds.c
index 45946f0..6bb6e09 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -93,7 +93,7 @@ int agent_mouse = TRUE;
 
 static void openssl_init();
 
-#define MIGRATE_TIMEOUT (1000 * 100) /* 10sec */
+#define MIGRATE_TIMEOUT (1000 * 10) /* 10sec */
 #define PING_INTERVAL (1000 * 10)
 #define KEY_MODIFIERS_TTL (1000 * 2) /*2sec*/
 #define MM_TIMER_GRANULARITY_MS (1000 / 30)