Merge pull request #109 from tisba/fix-race-condition-ts_utils-make_dir

Fix race condition in ts_utils:make_dir/1
processone · Mar 5, 2015 · 6e75081 · 6e75081
2 parents d18293a + db44ba7
commit 6e75081
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/tsung/ts_local_mon.erl b/src/tsung/ts_local_mon.erl
@@ -88,7 +88,7 @@ init([]) ->
     LogFileEnc = ts_config_server:decode_filename(?config(log_file)),
     FileName = filename:join(LogFileEnc, "tsung-"++Id ++ ".dump"),
     LogDir = filename:dirname(FileName),
-    ts_utils:make_dir_raw(LogDir),
+    ok = ts_utils:make_dir_raw(LogDir),
     case file:open(FileName,[write,raw, delayed_write]) of
         {ok, IODev} ->
             {ok, #state{dump_iodev=IODev}};

diff --git a/src/tsung/ts_utils.erl b/src/tsung/ts_utils.erl
@@ -447,6 +447,8 @@ make_dir_rec(Path, FileMod,[Parent|Childs]) ->
             case FileMod:make_dir(CurrentDir) of
                 ok ->
                     make_dir_rec(CurrentDir, FileMod, Childs);
+                {error, eexist} ->
+                    make_dir_rec(CurrentDir, FileMod, Childs);
                 Error ->
                     Error
             end;