Permalink
Browse files

Merge branch 'master' of github.com:processone/tsung into github

  • Loading branch information...
2 parents 55e0d1d + 7fe9f16 commit 621e4199293cf4080d360c6217c7fd174cd09af8 @nniclausse nniclausse committed Mar 29, 2013
Showing with 3 additions and 4 deletions.
  1. +3 −4 src/tsung_controller/ts_config.erl
@@ -218,18 +218,17 @@ parse(Element = #xmlElement{name=client, attributes=Attrs},
Fun = fun(N)->
IP = case Scan_Intf of
"" ->
- {ok, TmpIP } = inet:getaddr(N,inet),
- TmpIP;
+ [];
Interface ->
case os:type() of
{unix, linux} ->
- {scan, Interface};
+ [{scan, Interface}];
OS ->
io:format(standard_error,"Scan interface is not supported on OS ~p, abort~n",[OS]),
exit({error, scan_interface_not_supported_on_os})
end
end,
- #client{host=N,weight=Weight,ip=[IP],maxusers=MaxUsers}
+ #client{host=N,weight=Weight,ip=IP,maxusers=MaxUsers}
end,
lists:map(Fun, Nodes);
_ ->

0 comments on commit 621e419

Please sign in to comment.