File 0190-Don-t-truncate-existing-disk_logs.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0190-Don-t-truncate-existing-disk_logs.patch of Package erlang (Revision aa120d3233f613ad478314c3181372c5)

Currently displaying revision aa120d3233f613ad478314c3181372c5 , Show latest

From c6340153528c3a3c7dc348bf33f1bdc12c9627dd Mon Sep 17 00:00:00 2001
From: Vance Shipley <vances@sigscale.org>
Date: Fri, 7 Jul 2017 12:47:03 +0530
Subject: [PATCH 1/2] Don't truncate existing disk_logs.

An existing internal format disk_log will be repaired if possible.
If not possible a new log will be created. This is the behaviour
described in the documentation and code comments.
---
 lib/inets/src/http_server/mod_disk_log.erl | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/lib/inets/src/http_server/mod_disk_log.erl b/lib/inets/src/http_server/mod_disk_log.erl
index 3be5f2dd7..2023546f0 100644
--- a/lib/inets/src/http_server/mod_disk_log.erl
+++ b/lib/inets/src/http_server/mod_disk_log.erl
@@ -363,17 +363,21 @@ create_disk_log(Filename, MaxBytes, MaxFiles, ConfigList) ->
 %%----------------------------------------------------------------------
 
 open(Filename, MaxBytes, MaxFiles, internal) ->
-    Opts = [{format, internal}, {repair, truncate}],
-    open1(Filename, MaxBytes, MaxFiles, Opts);
+    Opt0 = {format, internal},
+    Opts1 = [Opt0, {repair, true}],
+    Opts2 = [Opt0, {repair, truncate}],
+    open1(Filename, MaxBytes, MaxFiles, Opts1, Opts2);
 open(Filename, MaxBytes, MaxFiles, _) ->
     Opts = [{format, external}],
-    open1(Filename, MaxBytes, MaxFiles, Opts).
+    open1(Filename, MaxBytes, MaxFiles, Opts, Opts).
 
-open1(Filename, MaxBytes, MaxFiles, Opts0) ->
-    Opts1 = [{name, Filename}, {file, Filename}, {type, wrap}] ++ Opts0,
-    case open2(Opts1, {MaxBytes, MaxFiles}) of
+open1(Filename, MaxBytes, MaxFiles, Opts1, Opts2) ->
+    Opts0 = [{name, Filename}, {file, Filename}, {type, wrap}],
+    case open2(Opts0 ++ Opts1, Opts0 ++ Opts2, {MaxBytes, MaxFiles}) of
         {ok, LogDB} ->
             {ok, LogDB};
+        {repaired, LogDB, {recovered, _}, {badbytes, _}} ->
+            {ok, LogDB};
         {error, Reason} ->
             {error, 
              ?NICE("Can't create " ++ Filename ++ 
@@ -382,11 +386,16 @@ open1(Filename, MaxBytes, MaxFiles, Opts0) ->
             {error, ?NICE("Can't create "++Filename)}
     end.
 
-open2(Opts, Size) ->
-    case disk_log:open(Opts) of
+open2(Opts1, Opts2, Size) ->
+    case disk_log:open(Opts1) of
         {error, {badarg, size}} ->
             %% File did not exist, add the size option and try again
-            disk_log:open([{size, Size} | Opts]);
+            disk_log:open([{size, Size} | Opts1]);
+        {error, {Reason, _}} when
+                Reason == not_a_log_file;
+                Reason == invalid_index_file ->
+            %% File was corrupt, add the truncate option and try again
+            disk_log:open([{size, Size} | Opts2]);
         Else ->
             Else
     end.
-- 
2.14.1

Places

File 0190-Don-t-truncate-existing-disk_logs.patch of Package erlang (Revision aa120d3233f613ad478314c3181372c5)

Places