Commit da7922b8 authored by Carla Goncalves Ourofino's avatar Carla Goncalves Ourofino
Browse files

Evita configuração múltipla dentro de configuração múltipla.

[SOMA-3827][SOMA-4041]
Showing with 40 additions and 1 deletion
+40 -1
......@@ -28,7 +28,9 @@ function configuration.read(filename, sga_name)
-- TODO: O que fazer nesse caso? Avisar que foi ignorado?
config.sga_name = nil
end
config, err = configuration.get(config.sga[sga_name], filename, config)
local config_data = config.sga[sga_name]
config.sga = nil
config, err = configuration.get(config_data, filename, config)
if not config then
return nil, "["..sga_name.."] "..err
end
......
csbase_server = "http://localhost:40409"
platform = "Linux26g4"
-- sgad_bind_addr = "127.0.0.1"
sgad_host = "localhost"
sgad_port = 12345
--sga_name = "chuva"
status_interval_s = 10
exec_polling_interval_s = 5
register_retry_s = 3
project_root_dir = os.getenv("HOME").."/test/sga-environment/csgrid/projects"
algorithm_root_dir = os.getenv("HOME").."/test/sga-environment/csgrid/algorithms"
runtime_data_dir = (os.getenv("TMPDIR") or "/tmp").."/sgad"
sandbox_root_dir = "/tmp/sgad/sandbox"
driver = "sga.driver.posix"
resources = {
"java",
"lua"
}
extra_config = {
csbase_transfer_name = "ssh-datatransfer",
csbase_csfs_root_dir = "/tmp/csfs_sandbox",
ssh_host = "localhost",
ssh_port = 22,
ssh_user_name = "csgrid",
ssh_private_key_path = "/home/csgrid/.ssh/foo_id_rsa"
}
sga.first = [[
platform = "Linux44_64"
sandbox_root_dir = "/tmp/sgad/sandbox-first-chuva"
]]
sga.second = [[
sga_name = "second"
platform = "Linux64e5"
sandbox_root_dir = "/tmp/sgad/sandbox-second-chuva"
]]
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment