| commit | 94dcbe80d0c64ed3d8efa5e73b201613022f742c | [log] [tgz] |
|---|---|---|
| author | Dan Shi <[email protected]> | Tue Jun 09 03:51:13 2015 |
| committer | Dan Shi <[email protected]> | Tue Jun 09 05:45:33 2015 |
| tree | 39dbcdd7fc8b389a368bd0a5e87398e03237fbc9 | |
| parent | f494c06c9043755e9f577191c9174d3ecb408f65 [diff] [blame] |
Ignore OSError in devserver psutil does not work properly in builder. The load info of devserver has no use in devserver anyway. Ignore such error when importing psutil. BUG=chromium:498053 TEST=local run devserver curl http://localhost:8082/check_health Change-Id: I29116b2d44c72fea276782b45d949b1005c034d9 Reviewed-on: https://chromium-review.googlesource.com/276247 Reviewed-by: Fang Deng <[email protected]> Commit-Queue: Dan Shi <[email protected]> Trybot-Ready: Dan Shi <[email protected]> Tested-by: Dan Shi <[email protected]>
diff --git a/devserver.py b/devserver.py index b2c57e7..b4bb063 100755 --- a/devserver.py +++ b/devserver.py
@@ -82,6 +82,14 @@ _Log('Python module psutil is not installed, devserver load data will not be ' 'collected') psutil = None +except OSError as e: + # Ignore error like following. psutil may not work properly in builder. Ignore + # the error as load information of devserver is not used in builder. + # OSError: [Errno 2] No such file or directory: '/dev/pts/0' + _Log('psutil is failed to be imported, error: %s. devserver load data will ' + 'not be collected.', e) + psutil = None + CACHED_ENTRIES = 12