summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Smith (work) <jhs@iriscouch.com>2013-02-11 05:04:30 +0000
committerJason Smith (work) <jhs@iriscouch.com>2013-02-11 05:29:25 +0000
commit87670bfaa7fc77aeafcfbd71fd5e693c3e48ea0e (patch)
treed47d94e2ace1dd77fbace5f3f07affa18c5c8c09
parent7cd2d3d3ad98c6ae7ef590be6e150f053e94502c (diff)
downloadcouchdb-87670bfaa7fc77aeafcfbd71fd5e693c3e48ea0e.tar.gz
Avoid reading a file if its size is 0
-rw-r--r--src/couchdb/couch_log.erl9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/couchdb/couch_log.erl b/src/couchdb/couch_log.erl
index 86d9bc8bf..937cf4b3f 100644
--- a/src/couchdb/couch_log.erl
+++ b/src/couchdb/couch_log.erl
@@ -283,7 +283,14 @@ get_query_server_messages(Pid, Level, Port, Message) ->
read(Bytes, Offset) ->
LogFileName = couch_config:get("log", "file"),
- LogFileSize = filelib:file_size(LogFileName),
+ case filelib:file_size(LogFileName)
+ of 0 ->
+ "";
+ LogFileSize ->
+ read(LogFileName, LogFileSize, Bytes, Offset)
+ end.
+
+read(LogFileName, LogFileSize, Bytes, Offset) ->
MaxChunkSize = list_to_integer(
couch_config:get("httpd", "log_max_chunk_size", "1000000")),
case Bytes > MaxChunkSize of