X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1d0a332825dfdb9f72c76eefacdca50f01bd67ed..767b749993089167120a533e43dc4b4e318bccde:/apps/workbench/config/arvados_config.rb diff --git a/apps/workbench/config/arvados_config.rb b/apps/workbench/config/arvados_config.rb index c1340b4ff5..007e8d0687 100644 --- a/apps/workbench/config/arvados_config.rb +++ b/apps/workbench/config/arvados_config.rb @@ -21,14 +21,15 @@ require 'open3' # Load the defaults, used by config:migrate and fallback loading # legacy application.yml -Open3.popen2("arvados-server", "config-dump", "-config=-", "-skip-legacy") do |stdin, stdout, status_thread| - stdin.write("Clusters: {xxxxx: {}}") - stdin.close - confs = YAML.load(stdout, deserialize_symbols: false) - clusterID, clusterConfig = confs["Clusters"].first - $arvados_config_defaults = clusterConfig - $arvados_config_defaults["ClusterID"] = clusterID +defaultYAML, stderr, status = Open3.capture3("arvados-server", "config-dump", "-config=-", "-skip-legacy", stdin_data: "Clusters: {xxxxx: {}}") +if !status.success? + puts stderr + raise "error loading config: #{status}" end +confs = YAML.load(defaultYAML, deserialize_symbols: false) +clusterID, clusterConfig = confs["Clusters"].first +$arvados_config_defaults = clusterConfig +$arvados_config_defaults["ClusterID"] = clusterID # Load the global config file Open3.popen2("arvados-server", "config-dump", "-skip-legacy") do |stdin, stdout, status_thread|