mirror of
https://github.com/MariaDB/server.git
synced 2025-09-02 09:41:40 +03:00
wl1668 -
Add support for getting events via mgmapi removed all traces of stat port BitKeeper/deleted/.del-NodeLogLevel.cpp~324045b93af7123b: Delete: ndb/src/mgmsrv/NodeLogLevel.cpp BitKeeper/deleted/.del-NodeLogLevel.hpp~4f4ab0fe52fb497c: Delete: ndb/src/mgmsrv/NodeLogLevel.hpp BitKeeper/deleted/.del-NodeLogLevelList.cpp~97dc9c909e3e92bf: Delete: ndb/src/mgmsrv/NodeLogLevelList.cpp BitKeeper/deleted/.del-NodeLogLevelList.hpp~ef567dd850abddc7: Delete: ndb/src/mgmsrv/NodeLogLevelList.hpp ndb/include/debugger/EventLogger.hpp: Split EventLogger into two classes ndb/include/kernel/LogLevel.hpp: Add some nice to have methods + use uint8 for storage ndb/include/kernel/signaldata/EventSubscribeReq.hpp: operator= ndb/include/kernel/signaldata/SetLogLevelOrd.hpp: operator= ndb/include/mgmapi/mgmapi.h: remove deprecated vars ndb/src/common/debugger/EventLogger.cpp: Split into 2 ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Remove hardcoded mgm stuff ndb/src/mgmsrv/CommandInterpreter.cpp: #if 0 some deprecated code ndb/src/mgmsrv/Makefile.am: remove NodeLogLevel* ndb/src/mgmsrv/MgmtSrvr.cpp: Remove dead code Handle multiple event listeners in mgmapi ndb/src/mgmsrv/MgmtSrvr.hpp: Remove dead code Handle multiple event listeners in mgmapi ndb/src/mgmsrv/Services.cpp: listen event method in mgmapi ndb/src/mgmsrv/Services.hpp: listen event method in mgmapi ndb/src/mgmsrv/main.cpp: remove stat port
This commit is contained in:
@@ -24,128 +24,15 @@
|
||||
#include <kernel/LogLevel.hpp>
|
||||
#include <signaldata/EventReport.hpp>
|
||||
|
||||
/**
|
||||
* The EventLogger is primarily used for logging NDB events
|
||||
* in the Management Server. It inherits all logging functionality of Logger.
|
||||
*
|
||||
* HOW TO USE
|
||||
*
|
||||
* 1) Create an EventLogger
|
||||
*
|
||||
* EventLogger myEventLogger = new EventLogger();
|
||||
*
|
||||
* 2) Log NDB events and other log messages.
|
||||
*
|
||||
* myEventLogger->info("Changing log levels.");
|
||||
*
|
||||
* EventReport* report = (EventReport*)&theSignalData[0];
|
||||
* myEventLogger->log(eventReport->getEventType(), theSignalData, aNodeId);
|
||||
*
|
||||
*
|
||||
* The following NDB event categories and log levels are enabled as default:
|
||||
*
|
||||
* EVENT-CATEGORY LOG-LEVEL
|
||||
*
|
||||
* Startup 4
|
||||
* Shutdown 1
|
||||
* Statistic 2
|
||||
* Checkpoint 5
|
||||
* NodeRestart 8
|
||||
* Connection 2
|
||||
* Error 15
|
||||
* Info 10
|
||||
*
|
||||
* @see Logger
|
||||
* @version #@ $Id: EventLogger.hpp,v 1.3 2003/09/01 10:15:52 innpeno Exp $
|
||||
*/
|
||||
class EventLogger : public Logger
|
||||
{
|
||||
class EventLoggerBase {
|
||||
public:
|
||||
/**
|
||||
* Default constructor. Enables default log levels and
|
||||
* sets the log category to 'EventLogger'.
|
||||
*/
|
||||
EventLogger();
|
||||
virtual ~EventLoggerBase();
|
||||
|
||||
/**
|
||||
* Destructor.
|
||||
* LogLevel settings
|
||||
*/
|
||||
~EventLogger();
|
||||
|
||||
/**
|
||||
* Opens/creates the eventlog with the specified filename.
|
||||
*
|
||||
* @param aFileName the eventlog filename.
|
||||
* @param maxNoFiles the maximum no of archived eventlog files.
|
||||
* @param maxFileSize the maximum eventlog file size.
|
||||
* @param maxLogEntries the maximum number of log entries before
|
||||
* checking time to archive.
|
||||
* @return true if successful.
|
||||
*/
|
||||
bool open(const char* logFileName,
|
||||
int maxNoFiles = FileLogHandler::MAX_NO_FILES,
|
||||
long int maxFileSize = FileLogHandler::MAX_FILE_SIZE,
|
||||
unsigned int maxLogEntries = FileLogHandler::MAX_LOG_ENTRIES);
|
||||
|
||||
/**
|
||||
* Closes the eventlog.
|
||||
*/
|
||||
void close();
|
||||
|
||||
/**
|
||||
* Logs the NDB event.
|
||||
*
|
||||
* @param nodeId the node id of event origin.
|
||||
* @param eventType the type of event.
|
||||
* @param theData the event data.
|
||||
* @deprecated use log(int eventType, const Uint32* theData, NodeId nodeId)
|
||||
*/
|
||||
void log(NodeId nodeId, int eventType, const Uint32* theData);
|
||||
|
||||
/**
|
||||
* Logs the NDB event.
|
||||
*
|
||||
* @param eventType the type of event.
|
||||
* @param theData the event data.
|
||||
* @param nodeId the node id of event origin.
|
||||
*/
|
||||
void log(int eventType, const Uint32* theData, NodeId nodeId = 0);
|
||||
|
||||
/**
|
||||
* Returns the current log levels.
|
||||
* Enable, disable log levels to filter the events that are sent to the
|
||||
* eventlog.
|
||||
*
|
||||
* @return the log level.
|
||||
*/
|
||||
LogLevel& getLoglevel();
|
||||
LogLevel m_logLevel;
|
||||
|
||||
/**
|
||||
* Returns the log level that is used to filter an event. The event will not
|
||||
* be logged unless its event category's log level is <= levelFilter.
|
||||
*
|
||||
* @return the log level filter that is used for all event categories.
|
||||
*/
|
||||
int getFilterLevel() const;
|
||||
/**
|
||||
* Sets log level filter. The event will be logged if
|
||||
* the event category's log level is <= 'filterLevel'.
|
||||
*
|
||||
* @param level the log level to filter.
|
||||
*/
|
||||
void setFilterLevel(int filterLevel);
|
||||
|
||||
/**
|
||||
* Returns the event text for the specified event report type.
|
||||
*
|
||||
* @param type the event type.
|
||||
* @param theData the event data.
|
||||
* @param nodeId a node id.
|
||||
* @return the event report text.
|
||||
*/
|
||||
static const char* getText(int type,
|
||||
const Uint32* theData, NodeId nodeId = 0);
|
||||
|
||||
/**
|
||||
* Find a category matching the string
|
||||
*
|
||||
@@ -193,22 +80,113 @@ public:
|
||||
};
|
||||
|
||||
static const EventRepLogLevelMatrix matrix[];
|
||||
static const Uint32 matrixSize;
|
||||
};
|
||||
|
||||
/**
|
||||
* The EventLogger is primarily used for logging NDB events
|
||||
* in the Management Server. It inherits all logging functionality of Logger.
|
||||
*
|
||||
* HOW TO USE
|
||||
*
|
||||
* 1) Create an EventLogger
|
||||
*
|
||||
* EventLogger myEventLogger = new EventLogger();
|
||||
*
|
||||
* 2) Log NDB events and other log messages.
|
||||
*
|
||||
* myEventLogger->info("Changing log levels.");
|
||||
*
|
||||
* EventReport* report = (EventReport*)&theSignalData[0];
|
||||
* myEventLogger->log(eventReport->getEventType(), theSignalData, aNodeId);
|
||||
*
|
||||
*
|
||||
* The following NDB event categories and log levels are enabled as default:
|
||||
*
|
||||
* EVENT-CATEGORY LOG-LEVEL
|
||||
*
|
||||
* Startup 4
|
||||
* Shutdown 1
|
||||
* Statistic 2
|
||||
* Checkpoint 5
|
||||
* NodeRestart 8
|
||||
* Connection 2
|
||||
* Error 15
|
||||
* Info 10
|
||||
*
|
||||
* @see Logger
|
||||
* @version #@ $Id: EventLogger.hpp,v 1.3 2003/09/01 10:15:52 innpeno Exp $
|
||||
*/
|
||||
class EventLogger : public EventLoggerBase, public Logger
|
||||
{
|
||||
public:
|
||||
/**
|
||||
* Default constructor. Enables default log levels and
|
||||
* sets the log category to 'EventLogger'.
|
||||
*/
|
||||
EventLogger();
|
||||
|
||||
/**
|
||||
* Default log levels for management nodes.
|
||||
*
|
||||
* threshold - is in range [0-15]
|
||||
* Destructor.
|
||||
*/
|
||||
struct EventLogMatrix {
|
||||
LogLevel::EventCategory eventCategory;
|
||||
Uint32 threshold;
|
||||
};
|
||||
virtual ~EventLogger();
|
||||
|
||||
static const EventLogMatrix defEventLogMatrix[];
|
||||
/**
|
||||
* Opens/creates the eventlog with the specified filename.
|
||||
*
|
||||
* @param aFileName the eventlog filename.
|
||||
* @param maxNoFiles the maximum no of archived eventlog files.
|
||||
* @param maxFileSize the maximum eventlog file size.
|
||||
* @param maxLogEntries the maximum number of log entries before
|
||||
* checking time to archive.
|
||||
* @return true if successful.
|
||||
*/
|
||||
bool open(const char* logFileName,
|
||||
int maxNoFiles = FileLogHandler::MAX_NO_FILES,
|
||||
long int maxFileSize = FileLogHandler::MAX_FILE_SIZE,
|
||||
unsigned int maxLogEntries = FileLogHandler::MAX_LOG_ENTRIES);
|
||||
|
||||
/**
|
||||
* Closes the eventlog.
|
||||
*/
|
||||
void close();
|
||||
|
||||
/**
|
||||
* Logs the NDB event.
|
||||
*
|
||||
* @param eventType the type of event.
|
||||
* @param theData the event data.
|
||||
* @param nodeId the node id of event origin.
|
||||
*/
|
||||
virtual void log(int eventType, const Uint32* theData, NodeId nodeId = 0);
|
||||
|
||||
/**
|
||||
* Returns the event text for the specified event report type.
|
||||
*
|
||||
* @param type the event type.
|
||||
* @param theData the event data.
|
||||
* @param nodeId a node id.
|
||||
* @return the event report text.
|
||||
*/
|
||||
static const char* getText(char * dst, size_t dst_len,
|
||||
int type,
|
||||
const Uint32* theData, NodeId nodeId = 0);
|
||||
|
||||
static const Uint32 matrixSize;
|
||||
static const Uint32 defEventLogMatrixSize;
|
||||
/**
|
||||
* Returns the log level that is used to filter an event. The event will not
|
||||
* be logged unless its event category's log level is <= levelFilter.
|
||||
*
|
||||
* @return the log level filter that is used for all event categories.
|
||||
*/
|
||||
int getFilterLevel() const;
|
||||
|
||||
/**
|
||||
* Sets log level filter. The event will be logged if
|
||||
* the event category's log level is <= 'filterLevel'.
|
||||
*
|
||||
* @param level the log level to filter.
|
||||
*/
|
||||
void setFilterLevel(int filterLevel);
|
||||
|
||||
private:
|
||||
/** Prohibit */
|
||||
@@ -216,11 +194,10 @@ private:
|
||||
EventLogger operator = (const EventLogger&);
|
||||
bool operator == (const EventLogger&);
|
||||
|
||||
LogLevel m_logLevel;
|
||||
Uint32 m_filterLevel;
|
||||
|
||||
STATIC_CONST(MAX_TEXT_LENGTH = 256);
|
||||
static char m_text[MAX_TEXT_LENGTH];
|
||||
char m_text[MAX_TEXT_LENGTH];
|
||||
};
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user