Skip to content

Commit

Permalink
(#732) run.rb: Combine stderr and stdout
Browse files Browse the repository at this point in the history
By default, `Puppet::Util::Execution.execute` only returns stdout.
Puppet writes errors to stderr. When the run task fails, it only shows
the successful output:

```
$ bolt task run puppet_agent::run --targets puppet
Started on puppet...
Finished on puppet:
  Info: Using environment 'production'
  Info: Retrieving pluginfacts
  Info: Retrieving plugin
  Info: Loading facts
  Notice: Requesting catalog from puppet.local:8140 (10.0.1.1)
  Notice: Catalog compiled by puppet.local

  *long json here*
```

With the patch:

```
$ bolt task run puppet_agent::run --targets puppet
Started on puppet...
Finished on puppet:
  Info: Using environment 'production'
  Info: Retrieving pluginfacts
  Info: Retrieving plugin
  Info: Loading facts
  Notice: Requesting catalog from puppet.local:8140 (10.0.1.1)
  Notice: Catalog compiled by puppet.spirit-int.betadots.training
  Error: Could not retrieve catalog from remote server: Error 500 on SERVER: Server Error: Evaluation Error: Error while evaluating a Function Call, Failed to execute '/pdb/query/v4' on at least 1 of the following 'server_urls': https://puppetdb:8081 (file: /opt/puppetlabs/puppet/modules/infrastructure/manifests/puppet/puppetserver.pp, line: 11, column: 14) on node puppet.local
  Warning: Not using cache on failed catalog
  Error: Could not retrieve catalog; skipping run

  *long json here*
``
  • Loading branch information
bastelfreak committed Nov 21, 2024
1 parent 05715a1 commit b233bcd
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion tasks/run.rb
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,8 @@ def try_run(last_run_report, params)
options = {
failonfail: false,
custom_environment: get_env_fix_up,
override_locale: false
override_locale: false,
combine: true # combine stdout and stderr
}

run_result = Puppet::Util::Execution.execute(command.reject(&:empty?), options)
Expand Down

0 comments on commit b233bcd

Please sign in to comment.