COUCHDB-1245 - enforce maximum chunk size for _log call to better man…

…age memory. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1156369 13f79535-47bb-0310-9956-ffa450edef68
cloudant · Aug 10, 2011 · 0ac7f70 · 0ac7f70
1 parent b2db4f1
commit 0ac7f70
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/etc/couchdb/default.ini.tpl.in b/etc/couchdb/default.ini.tpl.in
@@ -24,6 +24,7 @@ allow_jsonp = false
 ;server_options = [{backlog, 128}, {acceptor_pool_size, 16}]
 ; For more socket options, consult Erlang's module 'inet' man page.
 ;socket_options = [{recbuf, 262144}, {sndbuf, 262144}, {nodelay, true}]
+log_max_chunk_size = 1000000
 
 [ssl]
 port = 6984

diff --git a/src/couchdb/couch_log.erl b/src/couchdb/couch_log.erl
@@ -172,6 +172,15 @@ get_log_messages(Pid, Level, Format, Args) ->
 read(Bytes, Offset) ->
     LogFileName = couch_config:get("log", "file"),
     LogFileSize = filelib:file_size(LogFileName),
+    MaxChunkSize = list_to_integer(
+        couch_config:get("httpd", "log_max_chunk_size", "1000000")),
+    case Bytes > MaxChunkSize of
+    true ->
+        throw({bad_request, "'bytes' cannot exceed " ++
+            integer_to_list(MaxChunkSize)});
+    false ->
+        ok
+    end,
 
     {ok, Fd} = file:open(LogFileName, [read]),
     Start = lists:max([LogFileSize - Bytes, 0]) + Offset,