if filename is "-", read config from stdin (TSUN-193)

processone · Sep 23, 2011 · f7f7d08 · f7f7d08
1 parent 0dfefc2
commit f7f7d08
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 29 deletions.
diff --git a/src/tsung_controller/ts_config.erl b/src/tsung_controller/ts_config.erl
@@ -57,24 +57,26 @@
 %%% @doc:  read and parse the xml config file
 %%% @end
 %%%----------------------------------------------------------------------
+read(Filename=standard_io, LogDir) ->
+    ?LOG("Reading config file from stdin~n", ?NOTICE),
+    XML = read_stdio(),
+    handle_read(catch xmerl_scan:string(XML,
+                                      [{fetch_path,["/usr/share/tsung/","./"]},
+                                       {validation,true}]),Filename,LogDir);
 read(Filename, LogDir) ->
-    case catch xmerl_scan:file(Filename,
+    ?LOGF("Reading config file: ~s~n", [Filename], ?NOTICE),
-                               [{fetch_path,["/usr/share/tsung/","./"]},
+    handle_read(catch xmerl_scan:file(Filename,
-                                {validation,true}]) of
+                                      [{fetch_path,["/usr/share/tsung/","./"]},
-        {ok, Root = #xmlElement{}} ->  % xmerl-0.15
+                                       {validation,true}]),Filename,LogDir).
-            ?LOGF("Reading config file: ~s~n", [Filename], ?NOTICE),
+
-            Table = ets:new(sessiontable, [ordered_set, protected]),
+handle_read( {Root = #xmlElement{}, _Tail}, Filename, LogDir) ->
-            {ok, parse(Root, #config{session_tab = Table})};
+    Table = ets:new(sessiontable, [ordered_set, protected]),
-        {Root = #xmlElement{}, _Tail} ->  % xmerl-0.19 and up
+    backup_config(LogDir, Filename, Root),
-            ?LOGF("Reading config file: ~s~n", [Filename], ?NOTICE),
+    {ok, parse(Root, #config{session_tab = Table, proto_opts=#proto_opts{}})};
-            Table = ets:new(sessiontable, [ordered_set, protected]),
+handle_read({error,Reason},_,_) ->
-            backup_config(LogDir, Filename, Root),
+    {error, Reason};
-            {ok, parse(Root, #config{session_tab = Table, proto_opts=#proto_opts{}})};
+handle_read({'EXIT',Reason},_,_) ->
-        {error,Reason} ->
+    {error, Reason}.
-            {error, Reason};
-        {'EXIT',Reason} ->
-            {error, Reason}
-    end.
 
 %%%----------------------------------------------------------------------
 %%% Function: parse/2
@@ -948,6 +950,8 @@ shortnames(Hostname)->
 %%   Use parsed config file to expand all ENTITY
 %% @end
 %%----------------------------------------------------------------------
+backup_config(Dir,standard_io, Config) ->
+    backup_config(Dir, "tsung_stdin.xml", Config);
 backup_config(Dir, Name, Config) ->
     BaseName = filename:basename(Name),
     {ok,IOF}=file:open(filename:join(Dir,BaseName),[write]),
@@ -959,3 +963,15 @@ backup_config(Dir, Name, Config) ->
             ok
     end,
     file:close(IOF).
+
+%% @spec read_stdio()-> string()
+%% @doc Read config from standard input
+%% @end
+read_stdio()->
+    read_stdio(io:get_line(""),[]).
+
+read_stdio(eof, Data)->
+    lists:flatten(Data);
+read_stdio(Data,Acc) ->
+    read_stdio(io:get_line(""),[Acc,Data]).
+
diff --git a/src/tsung_controller/tsung_controller.erl b/src/tsung_controller/tsung_controller.erl
@@ -60,17 +60,23 @@ start(_Type, _StartArgs) ->
     end.
 
 start_phase(load_config, _StartType, _PhaseArgs) ->
-    Conf = ?config(config_file),
+    {Conf,Timeout} =
-    Timeout = case file:read_file_info(Conf) of
+        case ?config(config_file) of
-                  {ok, #file_info{size=Size}} when Size > 10000000 -> % > 10MB
+            "-"  ->
-                      erlang:display(["Can take up to 5mn to read config ",Size]),
+                {standard_io, 120000}; %2mn timeout
-                      300000; % 10mn
+            File ->
-                  {ok, #file_info{size=Size}} when Size > 1000000 ->  % > 1MB
+                T = case file:read_file_info(File) of
-                      erlang:display(["Can take up to 3mn to read config ",Size]),
+                        {ok, #file_info{size=Size}} when Size > 10000000 -> % > 10MB
-                      180000; % 5mn
+                            erlang:display(["Can take up to 5mn to read config ",Size]),
-                  {ok, #file_info{size=Size}} ->
+                            300000; % 10mn
-                      120000  % 2mn
+                        {ok, #file_info{size=Size}} when Size > 1000000 ->  % > 1MB
-                  end,
+                            erlang:display(["Can take up to 3mn to read config ",Size]),
+                            180000; % 5mn
+                        {ok, #file_info{size=_}} ->
+                            120000  % 2mn
+                    end,
+                {File, T}
+        end,
     case ts_config_server:read_config(Conf,Timeout) of
         {error,Reason}->
             erlang:display(["Config Error, aborting ! ", Reason]),

diff --git a/tsung.sh.in b/tsung.sh.in
@@ -90,7 +90,7 @@ version() {
 }
 
 checkconfig() {
-    if [ ! -e $CONF_OPT_FILE ]
+    if [ ! -e $CONF_OPT_FILE ] && [ $CONF_OPT_FILE != "-" ]
     then
         echo "Config file $CONF_OPT_FILE doesn't exist, aborting !"
         exit 1