Remove Logger.hpp references.

This commit is contained in:
Adam Ierymenko 2015-04-08 16:00:48 -07:00
parent 608b5ca13a
commit c894710ac1
6 changed files with 0 additions and 19 deletions

View File

@ -38,7 +38,6 @@
#include "CMWC4096.hpp" #include "CMWC4096.hpp"
#include "C25519.hpp" #include "C25519.hpp"
#include "CertificateOfMembership.hpp" #include "CertificateOfMembership.hpp"
#include "Logger.hpp"
namespace ZeroTier { namespace ZeroTier {

View File

@ -38,7 +38,6 @@
#include "Topology.hpp" #include "Topology.hpp"
#include "Buffer.hpp" #include "Buffer.hpp"
#include "Packet.hpp" #include "Packet.hpp"
#include "Logger.hpp"
#include "Address.hpp" #include "Address.hpp"
#include "Identity.hpp" #include "Identity.hpp"
#include "SelfAwareness.hpp" #include "SelfAwareness.hpp"
@ -107,7 +106,6 @@ Node::Node(
delete RR->mc; delete RR->mc;
delete RR->sw; delete RR->sw;
delete RR->prng; delete RR->prng;
delete RR->log;
delete RR; delete RR;
throw; throw;
} }
@ -138,7 +136,6 @@ Node::~Node()
delete RR->mc; delete RR->mc;
delete RR->sw; delete RR->sw;
delete RR->prng; delete RR->prng;
delete RR->log;
delete RR; delete RR;
} }

View File

@ -32,7 +32,6 @@
#include "Network.hpp" #include "Network.hpp"
#include "CertificateOfMembership.hpp" #include "CertificateOfMembership.hpp"
#include "Node.hpp" #include "Node.hpp"
#include "Logger.hpp"
namespace ZeroTier { namespace ZeroTier {

View File

@ -43,7 +43,6 @@
#include "Address.hpp" #include "Address.hpp"
#include "Utils.hpp" #include "Utils.hpp"
#include "Identity.hpp" #include "Identity.hpp"
#include "Logger.hpp"
#include "InetAddress.hpp" #include "InetAddress.hpp"
#include "Packet.hpp" #include "Packet.hpp"
#include "SharedPtr.hpp" #include "SharedPtr.hpp"

View File

@ -36,7 +36,6 @@
namespace ZeroTier { namespace ZeroTier {
class NodeConfig; class NodeConfig;
class Logger;
class Switch; class Switch;
class Topology; class Topology;
class CMWC4096; class CMWC4096;
@ -48,15 +47,6 @@ class SelfAwareness;
/** /**
* Holds global state for an instance of ZeroTier::Node * Holds global state for an instance of ZeroTier::Node
*
* I do not believe in mutable static variables, period, or in global static
* instances of objects that don't basically represent constants. It makes
* unit testing, embedding, threading, and other things hard and is poor
* practice.
*
* So we put everything that we would want to be global, like Logger, here
* and we give everybody this as _r. The Node creates and initializes this
* on startup and deletes things on shutdown.
*/ */
class RuntimeEnvironment class RuntimeEnvironment
{ {
@ -65,7 +55,6 @@ public:
node(n), node(n),
identity(), identity(),
netconfMaster((NetworkConfigMaster *)0), netconfMaster((NetworkConfigMaster *)0),
log((Logger *)0),
prng((CMWC4096 *)0), prng((CMWC4096 *)0),
sw((Switch *)0), sw((Switch *)0),
mc((Multicaster *)0), mc((Multicaster *)0),
@ -92,7 +81,6 @@ public:
* These are constant and never null after startup unless indicated. * These are constant and never null after startup unless indicated.
*/ */
Logger *log; // null if logging is disabled
CMWC4096 *prng; CMWC4096 *prng;
Switch *sw; Switch *sw;
Multicaster *mc; Multicaster *mc;

View File

@ -59,7 +59,6 @@
namespace ZeroTier { namespace ZeroTier {
class RuntimeEnvironment; class RuntimeEnvironment;
class Logger;
class Peer; class Peer;
/** /**