diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-10 19:14:47 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-10 19:14:47 +0000 |
| commit | bb8eceedd2847bc31bf02f4fc06d43e351a320cc (patch) | |
| tree | 15d20c9b1de3e5be009d4810fd655c1b30179ad8 | |
| parent | 538941221fc5518ed459d1239968a2fc7da8c257 (diff) | |
| download | chromium_src-bb8eceedd2847bc31bf02f4fc06d43e351a320cc.zip chromium_src-bb8eceedd2847bc31bf02f4fc06d43e351a320cc.tar.gz chromium_src-bb8eceedd2847bc31bf02f4fc06d43e351a320cc.tar.bz2 | |
linux: Make X error logging more precise.
This updates the IO error message to clarify that it
probably means that the X server is gone, and changes
a few messages' "error detected" to "error received".
BUG=none
Review URL: https://chromiumcodereview.appspot.com/11090047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161145 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chrome_browser_main_x11.cc | 2 | ||||
| -rw-r--r-- | ui/base/x/x11_util.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/chrome_browser_main_x11.cc b/chrome/browser/chrome_browser_main_x11.cc index acd4c80..8389977 100644 --- a/chrome/browser/chrome_browser_main_x11.cc +++ b/chrome/browser/chrome_browser_main_x11.cc @@ -59,7 +59,7 @@ int BrowserX11IOErrorHandler(Display* d) { // If there's an IO error it likely means the X server has gone away if (!g_in_x11_io_error_handler) { g_in_x11_io_error_handler = true; - LOG(ERROR) << "X IO Error detected"; + LOG(ERROR) << "X IO error received (X server probably went away)"; browser_shutdown::SetShuttingDownWithoutClosingBrowsers(true); browser::SessionEnding(); } diff --git a/ui/base/x/x11_util.cc b/ui/base/x/x11_util.cc index ffe827c6..05c9991 100644 --- a/ui/base/x/x11_util.cc +++ b/ui/base/x/x11_util.cc @@ -99,7 +99,7 @@ int DefaultX11ErrorHandler(Display* d, XErrorEvent* e) { base::Bind(&LogErrorEventDescription, d, *e)); } else { LOG(ERROR) - << "X Error detected: " + << "X error received: " << "serial " << e->serial << ", " << "error_code " << static_cast<int>(e->error_code) << ", " << "request_code " << static_cast<int>(e->request_code) << ", " @@ -110,7 +110,7 @@ int DefaultX11ErrorHandler(Display* d, XErrorEvent* e) { int DefaultX11IOErrorHandler(Display* d) { // If there's an IO error it likely means the X server has gone away - LOG(ERROR) << "X IO Error detected"; + LOG(ERROR) << "X IO error received (X server probably went away)"; _exit(1); } @@ -1620,7 +1620,7 @@ void LogErrorEventDescription(Display* dpy, } LOG(ERROR) - << "X Error detected: " + << "X error received: " << "serial " << error_event.serial << ", " << "error_code " << static_cast<int>(error_event.error_code) << " (" << error_str << "), " |