@@ -44,7 +44,7 @@ ping_master(Node) -> ping_master(Node) end. -init_helper(Master, NumNodes, Spec) when integer(NumNodes) -> +init_helper(Master, NumNodes, Spec) when is_integer(NumNodes) -> error_logger:info_msg("Starting with ~p set(s) of nodes.~n", [NumNodes]), start_rm(Master, explode_spec(Spec, NumNodes)). elibs/fuzed_node_supervisor.erl @@ -301,9 +301,9 @@ leader_cast(Name, Request) -> ok. -do_cast(Tag, Name, Request) when atom(Name) -> +do_cast(Tag, Name, Request) when is_atom(Name) -> Name ! {Tag, Request}; -do_cast(Tag, Pid, Request) when pid(Pid) -> +do_cast(Tag, Pid, Request) when is_pid(Pid) -> Pid ! {Tag, Request}. @@ -497,7 +497,7 @@ safe_loop(#server{mod = Mod, state = State} = Server, Role, % We are only monitoring one proc, the leader! Node = case From of {Name,_Node} -> _Node; - _ when pid(From) -> node(From) + _ when is_pid(From) -> node(From) end, case Node == E#election.leadernode of true -> @@ -511,7 +511,7 @@ safe_loop(#server{mod = Mod, state = State} = Server, Role, {'DOWN',Ref,process,From,_Reason} = Msg -> Node = case From of {Name,_Node} -> _Node; - _ when pid(From) -> node(From) + _ when is_pid(From) -> node(From) end, NewMon = E#election.monitored -- [{Ref,Node}], case lists:member(Node,E#election.candidate_nodes) of @@ -653,7 +653,7 @@ loop(#server{parent = Parent, % We are only monitoring one proc, the leader! Node = case From of {Name,_Node} -> _Node; - _ when pid(From) -> node(From) + _ when is_pid(From) -> node(From) end, case Node == E#election.leadernode of true -> @@ -667,7 +667,7 @@ loop(#server{parent = Parent, {'DOWN',Ref,process,From,_Reason} -> Node = case From of {Name,_Node} -> _Node; - _ when pid(From) -> node(From) + _ when is_pid(From) -> node(From) end, NewMon = E#election.monitored -- [{Ref,Node}], case lists:member(Node,E#election.candidate_nodes) of @@ -1058,7 +1058,7 @@ mon_node(E,Proc) -> Node = case Proc of {_Name,Node_} -> Node_; - Pid when pid(Pid) -> + Pid when is_pid(Pid) -> node(Pid) end, case iselem(Node,E#election.monitored) of elibs/gen_leader.erl @@ -128,7 +128,7 @@ process_detail_rval(String) -> normalize_detail_tuple({tags, Taglist}) -> {<<"tags">>, [list_to_binary(X) || X <- string:tokens(Taglist, ",")]}; normalize_detail_tuple({roles, RoleList}) -> {<<"roles">>, [list_to_binary(X) || X <- string:tokens(RoleList, ",")]}; -normalize_detail_tuple({Key, Value}) when integer(Value) -> {atom_to_binary(Key), list_to_binary(io_lib:format("~p", [Value]))}; +normalize_detail_tuple({Key, Value}) when is_integer(Value) -> {atom_to_binary(Key), list_to_binary(io_lib:format("~p", [Value]))}; normalize_detail_tuple({Key, Value}) when is_list(Value) -> {atom_to_binary(Key), process_detail_rval(Value)}; normalize_detail_tuple({Key, Value}) when is_atom(Value) -> {atom_to_binary(Key), atom_to_binary(Value)}. elibs/responders/master_responder.erl @@ -161,10 +161,8 @@ mochiweb_process_key(K) when is_atom(K) -> mochiweb_process_key(atom_to_list(K)); mochiweb_process_key(K) when is_list(K) -> Downcased = string:to_lower(K), - case regexp:gsub(Downcased, "-", "_") of - {ok, Cleaned, _Count} -> list_to_atom(Cleaned); - _ -> list_to_atom(Downcased) - end. + Cleaned = re:replace(Downcased, "-", "_", [ global, { return, list } ] ), + list_to_atom( Cleaned ). %% END Mochiweb Specific Stuff include/responder_base.erl 6784472e4b08cea97d1f731fea4fd6dd91f08f99 hydo hydo@mac.com http://github.com/KirinDave/fuzed/commit/393d3163f8ba27a8fc0a0093c7b7f5707a34bcfd 393d3163f8ba27a8fc0a0093c7b7f5707a34bcfd 2009-05-28T14:58:36-07:00 2009-05-28T14:58:36-07:00 * Removed the deprecated regex call and replaced it with re:replace in include/responder_base.erl * Replaced integer(), pid(), and atom() with is_integer(), is_pid(), and is_atom(). bc7edba982a552da86e1892eb6e4fe45679a4a2e hydo hydo@mac.com