Auto-start server (run_as_server) if EARLYBIND is "true" and "STARTSE…

…RVER" is not "false"

Project.toml

@@ -1,7 +1,7 @@
 name = "Genie"
 uuid = "c43c736e-a2d1-11e8-161f-af95117fbd1e"
 authors = ["Adrian Salceanu <[email protected]>"]
-version = "5.18.2"
+version = "5.19.0"
 
 [deps]
 ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"

src/Commands.jl

@@ -18,15 +18,16 @@ function execute(config::Genie.Configuration.Settings; server::Union{Sockets.TCP
 
   # overwrite env settings with command line arguments
   Genie.config.server_port = parse(Int, parsed_args["p"])
-  Genie.config.websockets_port = parsed_args["w"] == "nothing" ? nothing : parse(Int, parsed_args["w"])
+  Genie.config.websockets_port = lowercase(parsed_args["w"]) == "nothing" ? nothing : parse(Int, parsed_args["w"])
   Genie.config.server_host = parsed_args["l"]
-  Genie.config.websockets_exposed_host = parsed_args["x"] == "nothing" ? nothing : parsed_args["x"]
-  Genie.config.websockets_exposed_port = parsed_args["y"] == "nothing" ? nothing : parse(Int, parsed_args["y"])
+  Genie.config.websockets_exposed_host = lowercase(parsed_args["x"]) == "nothing" ? nothing : parsed_args["x"]
+  Genie.config.websockets_exposed_port = lowercase(parsed_args["y"]) == "nothing" ? nothing : parse(Int, parsed_args["y"])
   Genie.config.websockets_base_path = parsed_args["W"]
   Genie.config.base_path = parsed_args["b"]
 
-  if (called_command(parsed_args, "s") && get(parsed_args, "s", "false") == "true") ||
-      (haskey(ENV, "STARTSERVER") && parse(Bool, ENV["STARTSERVER"]))
+  if (called_command(parsed_args, "s") && lowercase(get(parsed_args, "s", "false")) == "true") ||
+      (haskey(ENV, "STARTSERVER") && parse(Bool, ENV["STARTSERVER"])) ||
+      (haskey(ENV, "EARLYBIND") && lowercase(get(ENV, "STARTSERVER", "")) != "false")
     Genie.config.run_as_server = true
     Base.invokelatest(Genie.up, Genie.config.server_port, Genie.config.server_host; server = server)
 

src/Genie.jl

@@ -92,7 +92,10 @@ julia> Genie.loadapp(".")
 [ Info: Logging to file at MyGenieApp/log/dev.log
 ```
 """
-function loadapp(path::String = "."; autostart::Bool = false, dbadapter::Union{Nothing,Symbol,String} = nothing, context = Main) :: Nothing
+function loadapp( path::String = ".";
+                  autostart::Bool = false,
+                  dbadapter::Union{Nothing,Symbol,String} = nothing,
+                  context = Main) :: Nothing
   if ! isnothing(dbadapter) && dbadapter != "nothing"
     Genie.Generator.autoconfdb(dbadapter)
   end

src/Loader.jl

@@ -27,7 +27,7 @@ function importenv()
 end
 
 
-function loadenv(; context)
+function loadenv(; context) :: Union{Sockets.TCPServer,Nothing}
   haskey(ENV, "GENIE_ENV") || (ENV["GENIE_ENV"] = "dev")
   bootstrap(context)
 
@@ -262,7 +262,7 @@ function sort_load_order(rootdir, lsdir::Vector{String})
   autoloadfilepath = isfile(joinpath(pwd(), rootdir, Genie.config.autoload_file)) ? joinpath(pwd(), rootdir, Genie.config.autoload_file) : return lsdir
   autoloadorder = open(f -> ([line for line in eachline(f)]), autoloadfilepath)
   fn_loadorder = []
-  
+
   for file in autoloadorder
     if file in lsdir
       push!(fn_loadorder, file)