New SiteFiles for fetching and managing ripple.txt files

This commit is contained in:
Vinnie Falco
2013-10-26 08:35:46 -07:00
parent f859bf160a
commit a39fa8ae5f
24 changed files with 1075 additions and 22 deletions

View File

@@ -30,6 +30,8 @@ static bool volatile doShutdown = false;
//
class ApplicationLog;
template <> char const* LogPartition::getPartitionName <ApplicationLog> () { return "Application"; }
class SiteFilesLog;
template <> char const* LogPartition::getPartitionName <SiteFilesLog> () { return "SiteFiles"; }
class ValidatorsLog;
template <> char const* LogPartition::getPartitionName <ValidatorsLog> () { return "Validators"; }
class JobQueueLog;
@@ -72,7 +74,7 @@ public:
, m_journal (LogJournal::get <ApplicationLog> ())
, m_tempNodeCache ("NodeCache", 16384, 90)
, m_sleCache ("LedgerEntryCache", 4096, 120)
, m_resourceManager (add (Resource::Manager::New (
LogJournal::get <ResourceManagerLog> ())))
@@ -93,6 +95,9 @@ public:
// Anything which calls addJob must be a descendant of the JobQueue
//
, m_siteFiles (SiteFiles::Manager::New (
*this, LogJournal::get <SiteFilesLog> ()))
, m_orderBookDB (*m_jobQueue)
, m_ledgerMaster (*m_jobQueue)
@@ -163,12 +168,22 @@ public:
}
//--------------------------------------------------------------------------
RPC::Manager& getRPCServiceManager()
{
return *m_rpcServiceManager;
}
JobQueue& getJobQueue ()
{
return *m_jobQueue;
}
SiteFiles::Manager& getSiteFiles()
{
return *m_siteFiles;
}
LocalCredentials& getLocalCredentials ()
{
return m_localCredentials ;
@@ -209,11 +224,6 @@ public:
return *m_nodeStore;
}
JobQueue& getJobQueue ()
{
return *m_jobQueue;
}
Application::LockType& getMasterLock ()
{
return m_masterMutex;
@@ -477,7 +487,7 @@ public:
// the creation of the peer SSL context and Peers object into
// the conditional.
//
m_peers = add (Peers::New (m_mainIoPool, *m_resourceManager,
m_peers = add (Peers::New (m_mainIoPool, *m_resourceManager, *m_siteFiles,
m_mainIoPool, m_peerSSLContext->get ()));
// If we're not in standalone mode,
@@ -850,13 +860,14 @@ private:
SLECache m_sleCache;
LocalCredentials m_localCredentials;
TransactionMaster m_txMaster;
ScopedPointer <Resource::Manager> m_resourceManager;
ScopedPointer <RPC::Manager> m_rpcServiceManager;
// These are Stoppable-related
ScopedPointer <JobQueue> m_jobQueue;
IoServicePool m_mainIoPool;
ScopedPointer <SiteFiles::Manager> m_siteFiles;
OrderBookDB m_orderBookDB;
LedgerMaster m_ledgerMaster;
ScopedPointer <NetworkOPs> m_networkOPs;

View File

@@ -21,7 +21,9 @@
#ifndef RIPPLE_APP_APPLICATION_H_INCLUDED
#define RIPPLE_APP_APPLICATION_H_INCLUDED
namespace SiteFiles { class Manager; }
namespace Validators { class Manager; }
namespace Resource { class Manager; }
namespace NodeStore { class Database; }
namespace RPC { class Manager; }
@@ -78,6 +80,9 @@ public:
virtual boost::asio::io_service& getIOService () = 0;
virtual RPC::Manager& getRPCServiceManager() = 0;
virtual JobQueue& getJobQueue () = 0;
virtual SiteFiles::Manager& getSiteFiles () = 0;
virtual NodeCache& getTempNodeCache () = 0;
virtual SLECache& getSLECache () = 0;
virtual Validators::Manager& getValidators () = 0;
@@ -91,7 +96,6 @@ public:
virtual UniqueNodeList& getUNL () = 0;
virtual Validations& getValidations () = 0;
virtual NodeStore::Database& getNodeStore () = 0;
virtual JobQueue& getJobQueue () = 0;
virtual InboundLedgers& getInboundLedgers () = 0;
virtual LedgerMaster& getLedgerMaster () = 0;
virtual NetworkOPs& getOPs () = 0;

View File

@@ -90,12 +90,16 @@ public:
PeersImp (Stoppable& parent,
Resource::Manager& resourceManager,
boost::asio::io_service& io_service,
boost::asio::ssl::context& ssl_context)
SiteFiles::Manager& siteFiles,
boost::asio::io_service& io_service,
boost::asio::ssl::context& ssl_context)
: Stoppable ("Peers", parent)
, m_resourceManager (resourceManager)
, m_peerFinder (add (PeerFinder::Manager::New (
*this, *this, LogJournal::get <PeerFinderLog> ())))
*this,
siteFiles,
*this,
LogJournal::get <PeerFinderLog> ())))
, m_io_service (io_service)
, m_ssl_context (ssl_context)
, mPeerLock (this, "PeersImp", __FILE__, __LINE__)
@@ -1123,9 +1127,10 @@ Peers::Peers ()
Peers* Peers::New (Stoppable& parent,
Resource::Manager& resourceManager,
boost::asio::io_service& io_service,
boost::asio::ssl::context& ssl_context)
SiteFiles::Manager& siteFiles,
boost::asio::io_service& io_service,
boost::asio::ssl::context& ssl_context)
{
return new PeersImp (parent, resourceManager, io_service, ssl_context);
return new PeersImp (parent, resourceManager, siteFiles, io_service, ssl_context);
}

View File

@@ -20,11 +20,15 @@
#ifndef RIPPLE_PEERS_H_INCLUDED
#define RIPPLE_PEERS_H_INCLUDED
namespace PeerFinder {
class Manager;
}
namespace Resource {
class Manager;
}
namespace PeerFinder {
namespace SiteFiles {
class Manager;
}
@@ -34,6 +38,7 @@ class Peers : public PropertyStream::Source
public:
static Peers* New (Stoppable& parent,
Resource::Manager& resourceManager,
SiteFiles::Manager& siteFiles,
boost::asio::io_service& io_service,
boost::asio::ssl::context& context);

View File

@@ -38,6 +38,7 @@
#include "../ripple/http/ripple_http.h"
#include "../ripple/resource/ripple_resource.h"
#include "../ripple/rpc/ripple_rpc.h"
#include "../ripple/sitefiles/ripple_sitefiles.h"
#include "../ripple/validators/ripple_validators.h"
#include "beast/beast/Asio.h"