From 97f1b41b4d842b0b0f13476a05b625c853a3472e Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Sat, 28 Sep 2013 09:53:50 -0700
Subject: [PATCH] Add more Validators journal reports

---
 src/ripple/validators/impl/Logic.h     |  2 +-
 src/ripple/validators/impl/Manager.cpp | 29 +++++++++++++++++++-------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/ripple/validators/impl/Logic.h b/src/ripple/validators/impl/Logic.h
index 684e82eb8..c29635d93 100644
--- a/src/ripple/validators/impl/Logic.h
+++ b/src/ripple/validators/impl/Logic.h
@@ -37,7 +37,7 @@ enum
     ,checkEverySeconds = 60 * 60
 #else
      secondsBetweenFetches = 5 * 60
-    ,checkEverySeconds = 60 * 60
+    ,checkEverySeconds = 60
 #endif
 
     // This tunes the preallocated arrays
diff --git a/src/ripple/validators/impl/Manager.cpp b/src/ripple/validators/impl/Manager.cpp
index 5b9a4e01a..57c183e28 100644
--- a/src/ripple/validators/impl/Manager.cpp
+++ b/src/ripple/validators/impl/Manager.cpp
@@ -129,10 +129,6 @@ public:
         , m_checkSources (true)
     {
         m_journal.sink().set_console (true);
-
-        addRPCHandlers();
-
-        startThread();
     }
 
     ~ManagerImp ()
@@ -145,9 +141,28 @@ public:
     // Stoppable
     //
 
-    void onStop (Journal)
+    void onPrepare (Journal journal)
     {
-        m_queue.dispatch (bind (&Thread::signalThreadShouldExit, this));
+        journal.info << "Preparing Validators";
+
+        addRPCHandlers();
+    }
+
+    void onStart (Journal journal)
+    {
+        journal.info << "Starting Validators";
+
+        startThread();
+    }
+
+    void onStop (Journal journal)
+    {
+        journal.info << "Stopping Validators";
+
+        if (this->Thread::isThreadRunning())
+            m_queue.dispatch (bind (&Thread::signalThreadShouldExit, this));
+        else
+            stopped();
     }
 
     //--------------------------------------------------------------------------
@@ -301,7 +316,7 @@ public:
                 m_checkSources = false;
 
                 m_journal.trace << "Next check timer expires in " <<
-                    RelativeTime::seconds (checkEverySeconds) << " seconds";
+                    RelativeTime::seconds (checkEverySeconds);
 
                 m_checkTimer.setExpiration (checkEverySeconds);
             }