summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2009-01-31 12:27:39 +1100
committerJames Turnbull <james@lovedthanlost.net>2009-01-31 12:27:39 +1100
commita065aeb567896be04ebac978a380e6becf4518eb (patch)
tree275b91dc3ea025bc8e35c62a0b26bcbf3d2fa19d
parentfa9dc73811f26ed70c412cb264413fbedf0fef55 (diff)
downloadpuppet-a065aeb567896be04ebac978a380e6becf4518eb.tar.gz
puppet-a065aeb567896be04ebac978a380e6becf4518eb.tar.xz
puppet-a065aeb567896be04ebac978a380e6becf4518eb.zip
Fixed #1910 - Updated logcheck regex
-rw-r--r--CHANGELOG2
-rw-r--r--ext/logcheck/puppet2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 877629957..cd206a81f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
0.25.0
+ Fixed #1910 - Updated logcheck regex
+
Fixed #1879 - Added to tidy documentation
Fixed #1881 - Added md5lite explanation
diff --git a/ext/logcheck/puppet b/ext/logcheck/puppet
index 449ec70f5..528eb42ce 100644
--- a/ext/logcheck/puppet
+++ b/ext/logcheck/puppet
@@ -1,5 +1,5 @@
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetmasterd\[[0-9]+\]: Starting Puppet server version [.0-9]+$
-^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetmasterd\[[0-9]+\]: Compiled configuration for [._[:alnum:]-]+ in [.0-9]+ seconds$
+^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetmasterd\[[0-9]+\]: Compiled catalog for [._[:alnum:]-]+ in [.0-9]+ seconds$
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetmasterd\[[0-9]+\]: Caught TERM; shutting down$
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetmasterd\[[0-9]+\]: Shutting down$
^\w{3} [ :0-9]{11} [._[:alnum:]-]+ puppetd\[[0-9]+\]: Starting Puppet client version [.0-9]+$