Skip to content

Commit

Permalink
fix naming conflict in core config that was causing the version to sh…
Browse files Browse the repository at this point in the history
…ow up as undefined.
  • Loading branch information
orthecreedence committed Oct 10, 2018
1 parent 38e3083 commit b8c65a9
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions www/core-adapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -124,17 +124,17 @@ var core_poller = setInterval(function() {
clearInterval(core_poller);
TurtlCore = window.TurtlCore;
var cert_file = window.openssl_cert_file;
var config = Composer.object.clone(turtl_core_config, {deep: true});
if(!config.logging) config.logging = {};
config.logging.level = 'info';
if(!config.api) config.api = {};
config.api.client_version_string = config.client+'/'+config.version;
config.data_folder = datadir;
var core_config = Composer.object.clone(turtl_core_config, {deep: true});
if(!core_config.logging) core_config.logging = {};
core_config.logging.level = 'info';
if(!core_config.api) core_config.api = {};
core_config.api.client_version_string = config.client+'/'+config.version;
core_config.data_folder = datadir;
// the core has no real way of loading the config.yaml asset so we need to
// to just pass in our entire config as a runtime config. thanks, obama.
config.config_file = ':null:';
config.openssl_cert_file = cert_file;
return TurtlCore.start(JSON.stringify(config))
core_config.config_file = ':null:';
core_config.openssl_cert_file = cert_file;
return TurtlCore.start(JSON.stringify(core_config))
.then(function() {
core_init = true;
})
Expand Down

0 comments on commit b8c65a9

Please sign in to comment.