diff options
| author | Tim Smith <tsmith84@gmail.com> | 2020-01-13 11:08:32 -0800 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2020-01-13 17:15:12 -0800 |
| commit | 11be0fb815e846400beb89724888e11ca1748d90 (patch) | |
| tree | a38f2ee0b065bf4ddc5a2f3feaaba83c8ae0f7c8 | |
| parent | 6ecd3150bb62c19bbf6f2f549883d70b401601b3 (diff) | |
| download | chef-windows_failures.tar.gz | |
Revert "Fix eventlog message description format"windows_failures
This reverts commit 19dd36852e14a1e70543f56ba117ad1ca2366f36.
| -rw-r--r-- | lib/chef/event_loggers/windows_eventlog.rb | 2 | ||||
| -rw-r--r-- | lib/chef/log/winevt.rb | 2 | ||||
| -rw-r--r-- | spec/functional/event_loggers/windows_eventlog_spec.rb | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/chef/event_loggers/windows_eventlog.rb b/lib/chef/event_loggers/windows_eventlog.rb index eecf0f033b..3ace9e6f44 100644 --- a/lib/chef/event_loggers/windows_eventlog.rb +++ b/lib/chef/event_loggers/windows_eventlog.rb @@ -36,7 +36,7 @@ class Chef LOG_CATEGORY_ID = 11001 # Since we must install the event logger, this is not really configurable - SOURCE = Chef::Dist::SHORT.freeze + SOURCE = "#{Chef::Dist::PRODUCT}".freeze def self.available? ChefUtils.windows? diff --git a/lib/chef/log/winevt.rb b/lib/chef/log/winevt.rb index be72f94dba..dcc13a77e4 100644 --- a/lib/chef/log/winevt.rb +++ b/lib/chef/log/winevt.rb @@ -37,7 +37,7 @@ class Chef FATAL_EVENT_ID = 10104 # Since we must install the event logger, this is not really configurable - SOURCE = Chef::Dist::SHORT.freeze + SOURCE = Chef::Dist::PRODUCT.freeze include Chef::Mixin::Unformatter diff --git a/spec/functional/event_loggers/windows_eventlog_spec.rb b/spec/functional/event_loggers/windows_eventlog_spec.rb index 5d66386b36..d6c4c481f3 100644 --- a/spec/functional/event_loggers/windows_eventlog_spec.rb +++ b/spec/functional/event_loggers/windows_eventlog_spec.rb @@ -49,7 +49,7 @@ describe Chef::EventLoggers::WindowsEventLogger, :windows_only do logger.run_start(version, run_status) expect(event_log.read(flags, offset).any? do |e| - e.source == Chef::Dist::SHORT && e.event_id == 10000 && + e.source == Chef::Dist::PRODUCT && e.event_id == 10000 && e.string_inserts[0].include?(version) end ).to be_truthy end @@ -58,7 +58,7 @@ describe Chef::EventLoggers::WindowsEventLogger, :windows_only do logger.run_started(run_status) expect(event_log.read(flags, offset).any? do |e| - e.source == Chef::Dist::SHORT && e.event_id == 10001 && + e.source == Chef::Dist::PRODUCT && e.event_id == 10001 && e.string_inserts[0].include?(run_id) end ).to be_truthy end @@ -68,7 +68,7 @@ describe Chef::EventLoggers::WindowsEventLogger, :windows_only do logger.run_completed(node) expect(event_log.read(flags, offset).any? do |e| - e.source == Chef::Dist::SHORT && e.event_id == 10002 && + e.source == Chef::Dist::PRODUCT && e.event_id == 10002 && e.string_inserts[0].include?(run_id) && e.string_inserts[1].include?(elapsed_time.to_s) end).to be_truthy @@ -79,7 +79,7 @@ describe Chef::EventLoggers::WindowsEventLogger, :windows_only do logger.run_failed(mock_exception) expect(event_log.read(flags, offset).any? do |e| - e.source == Chef::Dist::SHORT && e.event_id == 10003 && + e.source == Chef::Dist::PRODUCT && e.event_id == 10003 && e.string_inserts[0].include?(run_id) && e.string_inserts[1].include?(elapsed_time.to_s) && e.string_inserts[2].include?(mock_exception.class.name) && @@ -93,7 +93,7 @@ describe Chef::EventLoggers::WindowsEventLogger, :windows_only do logger.run_failed(mock_exception) expect(event_log.read(flags, offset).any? do |e| - e.source == Chef::Dist::SHORT && e.event_id == 10003 && + e.source == Chef::Dist::PRODUCT && e.event_id == 10003 && e.string_inserts[0].include?("UNKNOWN") && e.string_inserts[1].include?("UNKNOWN") && e.string_inserts[2].include?(mock_exception.class.name) && |