saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #53829 from saltstack/fix_stats_2019.2.1

Browse source 
Fix stats on windows
This commit is contained in:
Daniel Wozniak 2019-07-11 18:03:46 -07:00 • committed by GitHub
commit 5064027b9d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/master.py
View file

@ -1002,6 +1002,7 @@ class MWorker(salt.utils.process.SignalHandlingMultiprocessingProcess):
self.mkey = state['mkey']
self.key = state['key']
self.k_mtime = state['k_mtime']
self.stats = state['stats']
SMaster.secrets = state['secrets']
def __getstate__(self):
@ -1012,6 +1013,7 @@ class MWorker(salt.utils.process.SignalHandlingMultiprocessingProcess):
'key': self.key,
'k_mtime': self.k_mtime,
'secrets': SMaster.secrets,
'stats': self.stats,
'log_queue': self.log_queue,
'log_queue_level': self.log_queue_level
}