summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2010-05-19 12:09:22 +0200
committerGerd Hoffmann <kraxel@redhat.com>2010-05-19 12:09:22 +0200
commitd9084bfb64a59bb1c6c45228a5b475f36a6fffef (patch)
treeb103c71510a80fffc1e31bb198a2bce63073cae8
parentf67b2e74880ff17592acf739b91097be3cec9903 (diff)
downloadspice-d9084bfb64a59bb1c6c45228a5b475f36a6fffef.tar.gz
spice-d9084bfb64a59bb1c6c45228a5b475f36a6fffef.tar.xz
spice-d9084bfb64a59bb1c6c45228a5b475f36a6fffef.zip
Revert "[debug] migration troubleshooting"
This reverts commit 08927fabe57c17086fe3bce3a9ca166e2309349e.
-rw-r--r--client/application.cpp2
-rw-r--r--server/reds.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/client/application.cpp b/client/application.cpp
index 74f55437..4eb8ac88 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 45946f0c..6bb6e095 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)