forked from hiway/freedive
Refactor func names
This commit is contained in:
parent
4f90ccb047
commit
d6b2522fdc
1 changed files with 5 additions and 5 deletions
|
@ -14,7 +14,7 @@ defmodule Freedive.Api.Service.Cli do
|
||||||
enabled_service_names = enabled_service_names()
|
enabled_service_names = enabled_service_names()
|
||||||
|
|
||||||
all_service_names
|
all_service_names
|
||||||
|> Enum.map(fn name -> service_details(name, Enum.member?(enabled_service_names, name)) end)
|
|> Enum.map(fn name -> service_details!(name, Enum.member?(enabled_service_names, name)) end)
|
||||||
|> Enum.into(%{}, &{&1[:name], &1})
|
|> Enum.into(%{}, &{&1[:name], &1})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -56,7 +56,7 @@ defmodule Freedive.Api.Service.Cli do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def service_details(name, enabled \\ nil) do
|
def service_details!(name, enabled \\ nil) do
|
||||||
enabled = if(enabled != nil, do: enabled, else: service_is_enabled?(name))
|
enabled = if(enabled != nil, do: enabled, else: service_is_enabled?(name))
|
||||||
|
|
||||||
%{
|
%{
|
||||||
|
@ -71,7 +71,7 @@ defmodule Freedive.Api.Service.Cli do
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
def refresh(service) do
|
def refresh_service!(service) do
|
||||||
name = service.name
|
name = service.name
|
||||||
|
|
||||||
%{
|
%{
|
||||||
|
@ -134,11 +134,11 @@ defmodule Freedive.Api.Service.Cli do
|
||||||
defp service(name, command, args) do
|
defp service(name, command, args) do
|
||||||
case execute(@service_bin, [name, command] ++ args, doas: true) do
|
case execute(@service_bin, [name, command] ++ args, doas: true) do
|
||||||
{:ok, stdout} ->
|
{:ok, stdout} ->
|
||||||
# Logger.debug("service, log: #{inspect(stdout)}")
|
Logger.debug("service #{name} #{command} #{args}: #{inspect(stdout)}")
|
||||||
{:ok, stdout}
|
{:ok, stdout}
|
||||||
|
|
||||||
{:error, {stderr, code}} ->
|
{:error, {stderr, code}} ->
|
||||||
# Logger.warning("service #{name} #{command}: #{String.trim(stderr)}")
|
Logger.debug("service #{name} #{command} #{args}: (#{code}) #{String.trim(stderr)}")
|
||||||
{:error, {stderr, code}}
|
{:error, {stderr, code}}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue