Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From da172fd6234b3b2b487ab36d63da72758829cb1d Mon Sep 17 00:00:00 2001 |
| 2 | From: iwamatsu <iwamatsu@7c53e7cc-98ea-0310-8f1f-a0b24da60408> |
| 3 | Date: Fri, 17 Jun 2011 20:35:15 +0000 |
| 4 | Subject: [PATCH 7/8] Fix tty slowness |
| 5 | |
| 6 | Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> |
| 7 | |
| 8 | git-svn-id: svn://svn.berlios.de/slim/trunk@181 7c53e7cc-98ea-0310-8f1f-a0b24da60408 |
| 9 | --- |
| 10 | app.cpp | 10 ++++++---- |
| 11 | 1 files changed, 6 insertions(+), 4 deletions(-) |
| 12 | |
| 13 | diff --git a/app.cpp b/app.cpp |
| 14 | index 7177363..44ab099 100644 |
| 15 | --- a/app.cpp |
| 16 | +++ b/app.cpp |
| 17 | @@ -278,21 +278,23 @@ void App::Run() { |
| 18 | signal(SIGALRM, AlarmSignal); |
| 19 | |
| 20 | #ifndef XNEST_DEBUG |
| 21 | - OpenLog(); |
| 22 | - |
| 23 | if (!force_nodaemon && cfg->getOption("daemon") == "yes") { |
| 24 | daemonmode = true; |
| 25 | } |
| 26 | |
| 27 | // Daemonize |
| 28 | if (daemonmode) { |
| 29 | - if (daemon(0, 1) == -1) { |
| 30 | + if (daemon(0, 0) == -1) { |
| 31 | cerr << APPNAME << ": " << strerror(errno) << endl; |
| 32 | exit(ERR_EXIT); |
| 33 | } |
| 34 | - UpdatePid(); |
| 35 | } |
| 36 | |
| 37 | + OpenLog(); |
| 38 | + |
| 39 | + if (daemonmode) |
| 40 | + UpdatePid(); |
| 41 | + |
| 42 | CreateServerAuth(); |
| 43 | StartServer(); |
| 44 | alarm(2); |
| 45 | -- |
| 46 | 1.6.6.1 |
| 47 | |