Browse Source

incident return,{return,[{error,[]}]}} in main loop. take one to fix

Namdak Tonpa 6 years ago
parent
commit
9eea6776a4
1 changed files with 4 additions and 4 deletions
  1. 4 4
      src/mad.erl

+ 4 - 4
src/mad.erl

@@ -14,7 +14,7 @@ main(Params)      ->
 
 
     halt(return(
     halt(return(
         lists:any(fun({error,_}) -> true; (_) -> false end,
         lists:any(fun({error,_}) -> true; (_) -> false end,
-        lists:flatten(
+        lists:flatten([
         lists:foldl(
         lists:foldl(
         fun ({Fun,Arg},[]) ->
         fun ({Fun,Arg},[]) ->
                 mad_hooks:run_hooks(pre, Fun),
                 mad_hooks:run_hooks(pre, Fun),
@@ -22,8 +22,8 @@ main(Params)      ->
                 mad_hooks:run_hooks(post, Fun),
                 mad_hooks:run_hooks(post, Fun),
                 Errors;
                 Errors;
             ({_,_},Err) ->
             ({_,_},Err) ->
-                errors(Invalid), {return,Err}
-        end, [], Valid))))).
+                errors(Invalid)
+        end, [], Valid)])))).
 
 
 atomize("static") -> 'static';
 atomize("static") -> 'static';
 atomize("deploy") -> 'deploy';
 atomize("deploy") -> 'deploy';
@@ -49,7 +49,7 @@ profile()         -> application:get_env(mad,profile,mad_local).
 
 
 errors([])            -> [];
 errors([])            -> [];
 errors(false)         -> [];
 errors(false)         -> [];
-errors(true)          -> {error,unknown};
+errors(true)          -> [{error,unknown}];
 errors({error,Where}) -> info("ERROR~n"), [{error,Where}];
 errors({error,Where}) -> info("ERROR~n"), [{error,Where}];
 errors({ok,_})        -> info("OK~n",[]), [].
 errors({ok,_})        -> info("OK~n",[]), [].