Skip to content

Commit

Permalink
fix(publish): fix loggers
Browse files Browse the repository at this point in the history
  • Loading branch information
trieloff committed May 8, 2019
1 parent adf486f commit 1db7669
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/remotepublish.cmd.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,16 +122,16 @@ class RemotePublishCommand extends AbstractCommand {
this._filter = (master, current) => {
const leftmatch = master && master.name && !negate(globex.test(master.name));
const rightmatch = current && current.name && negate(globex.test(current.name));
this.logger.debug('matches:', master ? master.name : undefined, leftmatch, current ? current.name : undefined, rightmatch);
this.log.debug('matches:', master ? master.name : undefined, leftmatch, current ? current.name : undefined, rightmatch);
if (rightmatch) {
this.logger.debug('using current');
this.log.debug('using current');
return current;
}
if (leftmatch) {
this.logger.debug('using master');
this.log.debug('using master');
return master;
}
this.logger.debug('using none');
this.log.debug('using none');
return undefined;
};
return this;
Expand Down Expand Up @@ -197,17 +197,17 @@ class RemotePublishCommand extends AbstractCommand {
this.tick(1, 'preparing service config for Helix', true);

if (this._filter) {
this.logger.debug('filtering');
this.log.debug('filtering');
const content = await GitUtils.getRawContent('.', 'master', 'helix-config.yaml');

const other = await new HelixConfig()
.withSource(content.toString())
.init();

this.logger.debug('this', this.config.strains.keys());
this.logger.debug('other', other.strains.keys());
this.log.debug('this', this.config.strains.keys());
this.log.debug('other', other.strains.keys());
const merged = other.merge(this.config, this._filter);
this.logger.debug(merged.strains.keys());
this.log.debug(merged.strains.keys());

this._config = merged;
}
Expand Down

0 comments on commit 1db7669

Please sign in to comment.