[Code cleanup] Fixed tabs.
This commit is contained in:
Enrico Giordani
@@ -290,9 +290,9 @@ public:
|
||||
{ "current-epoch", &fp1 }, // sentinel current-epoch <epoch>
|
||||
{ "leader-epoch", &fp2 }, // sentinel leader-epoch [name] [epoch]
|
||||
{ "known-slave", &fp3 }, // sentinel known-slave <name> <ip> <port>
|
||||
{ "known-sentinel", &fp4 }, // sentinel known-sentinel <name> <ip> <port> [runid]
|
||||
{ "announce-ip", &fp1 }, // sentinel announce-ip <ip>
|
||||
{ "announce-port", &fp1 } // sentinel announce-port <port>
|
||||
{ "known-sentinel", &fp4 }, // sentinel known-sentinel <name> <ip> <port> [runid]
|
||||
{ "announce-ip", &fp1 }, // sentinel announce-ip <ip>
|
||||
{ "announce-port", &fp1 } // sentinel announce-port <port>
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -33,128 +33,128 @@ using namespace std;
|
||||
#include "EventLog.h"
|
||||
|
||||
void RedisEventLog::UninstallEventLogSource() {
|
||||
SmartRegistryHandle appKey;
|
||||
if (ERROR_SUCCESS == RegOpenKeyA(HKEY_LOCAL_MACHINE, cEventLogApplicitonPath.c_str(), appKey)) {
|
||||
SmartRegistryHandle eventLogNameKey;
|
||||
if (ERROR_SUCCESS == RegOpenKeyA(appKey, eventLogName.c_str(), eventLogNameKey)) {
|
||||
if (ERROR_SUCCESS != RegDeleteKeyA(appKey, eventLogName.c_str())) {
|
||||
throw std::system_error(GetLastError(), system_category(), "RegDeleteKeyA failed");
|
||||
}
|
||||
}
|
||||
}
|
||||
SmartRegistryHandle appKey;
|
||||
if (ERROR_SUCCESS == RegOpenKeyA(HKEY_LOCAL_MACHINE, cEventLogApplicitonPath.c_str(), appKey)) {
|
||||
SmartRegistryHandle eventLogNameKey;
|
||||
if (ERROR_SUCCESS == RegOpenKeyA(appKey, eventLogName.c_str(), eventLogNameKey)) {
|
||||
if (ERROR_SUCCESS != RegDeleteKeyA(appKey, eventLogName.c_str())) {
|
||||
throw std::system_error(GetLastError(), system_category(), "RegDeleteKeyA failed");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
SmartRegistryHandle eventLogKey;
|
||||
if (ERROR_SUCCESS == RegOpenKeyA(HKEY_LOCAL_MACHINE, cEventLogPath.c_str(), eventLogKey)) {
|
||||
SmartRegistryHandle eventServiceKey;
|
||||
if (ERROR_SUCCESS == RegOpenKeyA(eventLogKey, cRedis.c_str(), eventServiceKey)) {
|
||||
SmartRegistryHandle eventServiceSubKey;
|
||||
if (ERROR_SUCCESS == RegOpenKeyA(eventServiceKey, cRedisServer.c_str(), eventServiceSubKey)) {
|
||||
if (ERROR_SUCCESS != RegDeleteKeyA(eventServiceKey, cRedisServer.c_str())) {
|
||||
throw std::system_error(GetLastError(), system_category(), "RegDeleteKeyA failed");
|
||||
}
|
||||
if (ERROR_SUCCESS != RegDeleteKeyA(eventLogKey, cRedis.c_str())) {
|
||||
throw std::system_error(GetLastError(), system_category(), "RegDeleteKeyA failed");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
SmartRegistryHandle eventLogKey;
|
||||
if (ERROR_SUCCESS == RegOpenKeyA(HKEY_LOCAL_MACHINE, cEventLogPath.c_str(), eventLogKey)) {
|
||||
SmartRegistryHandle eventServiceKey;
|
||||
if (ERROR_SUCCESS == RegOpenKeyA(eventLogKey, cRedis.c_str(), eventServiceKey)) {
|
||||
SmartRegistryHandle eventServiceSubKey;
|
||||
if (ERROR_SUCCESS == RegOpenKeyA(eventServiceKey, cRedisServer.c_str(), eventServiceSubKey)) {
|
||||
if (ERROR_SUCCESS != RegDeleteKeyA(eventServiceKey, cRedisServer.c_str())) {
|
||||
throw std::system_error(GetLastError(), system_category(), "RegDeleteKeyA failed");
|
||||
}
|
||||
if (ERROR_SUCCESS != RegDeleteKeyA(eventLogKey, cRedis.c_str())) {
|
||||
throw std::system_error(GetLastError(), system_category(), "RegDeleteKeyA failed");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// sets up the registry keys required for the EventViewer message filter
|
||||
void RedisEventLog::InstallEventLogSource(string appPath) {
|
||||
SmartRegistryHandle eventLogKey;
|
||||
if (ERROR_SUCCESS != RegOpenKeyA(HKEY_LOCAL_MACHINE, cEventLogPath.c_str(), eventLogKey)) {
|
||||
throw std::system_error(GetLastError(), system_category(), "RegOpenKey failed");
|
||||
}
|
||||
SmartRegistryHandle redis1;
|
||||
if (ERROR_SUCCESS != RegOpenKeyA(eventLogKey, cRedis.c_str(), redis1)) {
|
||||
if (ERROR_SUCCESS != RegCreateKeyA(eventLogKey, cRedis.c_str(), redis1)) {
|
||||
throw std::system_error(GetLastError(), system_category(), "RegCreateKeyA failed");
|
||||
}
|
||||
}
|
||||
SmartRegistryHandle redisserver;
|
||||
if (ERROR_SUCCESS != RegOpenKeyA(redis1, cRedisServer.c_str(), redisserver)) {
|
||||
if (ERROR_SUCCESS != RegCreateKeyA(redis1, cRedisServer.c_str(), redisserver)) {
|
||||
throw std::system_error(GetLastError(), system_category(), "RegCreateKeyA failed");
|
||||
}
|
||||
}
|
||||
DWORD value = 0;
|
||||
DWORD type = REG_DWORD;
|
||||
DWORD size = sizeof(DWORD);
|
||||
if (ERROR_SUCCESS != RegQueryValueExA(redisserver, cTypesSupported.c_str(), 0, &type, NULL, &size)) {
|
||||
if (ERROR_SUCCESS != RegSetValueExA(redisserver, cTypesSupported.c_str(), 0, REG_DWORD, (const BYTE*)&value, sizeof(DWORD))) {
|
||||
throw std::system_error(GetLastError(), system_category(), "RegSetValueExA failed");
|
||||
}
|
||||
}
|
||||
type = REG_SZ;
|
||||
size = 0;
|
||||
if (ERROR_SUCCESS != RegQueryValueExA(redisserver, cEventMessageFile.c_str(), 0, &type, NULL, &size)) {
|
||||
if (ERROR_SUCCESS != RegSetValueExA(redisserver, cEventMessageFile.c_str(), 0, REG_SZ, (BYTE*)appPath.c_str(), (DWORD)appPath.length())) {
|
||||
throw std::system_error(GetLastError(), system_category(), "RegSetValueExA failed");
|
||||
}
|
||||
}
|
||||
SmartRegistryHandle eventLogKey;
|
||||
if (ERROR_SUCCESS != RegOpenKeyA(HKEY_LOCAL_MACHINE, cEventLogPath.c_str(), eventLogKey)) {
|
||||
throw std::system_error(GetLastError(), system_category(), "RegOpenKey failed");
|
||||
}
|
||||
SmartRegistryHandle redis1;
|
||||
if (ERROR_SUCCESS != RegOpenKeyA(eventLogKey, cRedis.c_str(), redis1)) {
|
||||
if (ERROR_SUCCESS != RegCreateKeyA(eventLogKey, cRedis.c_str(), redis1)) {
|
||||
throw std::system_error(GetLastError(), system_category(), "RegCreateKeyA failed");
|
||||
}
|
||||
}
|
||||
SmartRegistryHandle redisserver;
|
||||
if (ERROR_SUCCESS != RegOpenKeyA(redis1, cRedisServer.c_str(), redisserver)) {
|
||||
if (ERROR_SUCCESS != RegCreateKeyA(redis1, cRedisServer.c_str(), redisserver)) {
|
||||
throw std::system_error(GetLastError(), system_category(), "RegCreateKeyA failed");
|
||||
}
|
||||
}
|
||||
DWORD value = 0;
|
||||
DWORD type = REG_DWORD;
|
||||
DWORD size = sizeof(DWORD);
|
||||
if (ERROR_SUCCESS != RegQueryValueExA(redisserver, cTypesSupported.c_str(), 0, &type, NULL, &size)) {
|
||||
if (ERROR_SUCCESS != RegSetValueExA(redisserver, cTypesSupported.c_str(), 0, REG_DWORD, (const BYTE*)&value, sizeof(DWORD))) {
|
||||
throw std::system_error(GetLastError(), system_category(), "RegSetValueExA failed");
|
||||
}
|
||||
}
|
||||
type = REG_SZ;
|
||||
size = 0;
|
||||
if (ERROR_SUCCESS != RegQueryValueExA(redisserver, cEventMessageFile.c_str(), 0, &type, NULL, &size)) {
|
||||
if (ERROR_SUCCESS != RegSetValueExA(redisserver, cEventMessageFile.c_str(), 0, REG_SZ, (BYTE*)appPath.c_str(), (DWORD)appPath.length())) {
|
||||
throw std::system_error(GetLastError(), system_category(), "RegSetValueExA failed");
|
||||
}
|
||||
}
|
||||
|
||||
SmartRegistryHandle application;
|
||||
if (ERROR_SUCCESS != RegOpenKeyA(eventLogKey, cApplication.c_str() , application)) {
|
||||
throw std::system_error(GetLastError(), system_category(), "RegCreateKeyA failed");
|
||||
}
|
||||
SmartRegistryHandle redis2;
|
||||
if (ERROR_SUCCESS != RegOpenKeyA(application, cRedis.c_str(), redis2)) {
|
||||
if (ERROR_SUCCESS != RegCreateKeyA(application, cRedis.c_str(), redis2)) {
|
||||
throw std::system_error(GetLastError(), system_category(), "RegCreateKeyA failed");
|
||||
}
|
||||
}
|
||||
type = REG_DWORD;
|
||||
size = 0;
|
||||
if (ERROR_SUCCESS != RegQueryValueExA(redis2, cTypesSupported.c_str(), 0, &type, NULL, &size)) {
|
||||
if (ERROR_SUCCESS != RegSetValueExA(redis2, cTypesSupported.c_str(), 0, REG_DWORD, (const BYTE*)&value, sizeof(DWORD))) {
|
||||
throw std::system_error(GetLastError(), system_category(), "RegSetValueExA failed");
|
||||
}
|
||||
}
|
||||
if (ERROR_SUCCESS != RegQueryValueExA(redis2, cEventMessageFile.c_str(), 0, &type, NULL, &size)) {
|
||||
if (ERROR_SUCCESS != RegSetValueExA(redis2, cEventMessageFile.c_str(), 0, REG_SZ, (BYTE*)appPath.c_str(), (DWORD)appPath.length())) {
|
||||
throw std::system_error(GetLastError(), system_category(), "RegSetValueExA failed");
|
||||
}
|
||||
}
|
||||
SmartRegistryHandle application;
|
||||
if (ERROR_SUCCESS != RegOpenKeyA(eventLogKey, cApplication.c_str() , application)) {
|
||||
throw std::system_error(GetLastError(), system_category(), "RegCreateKeyA failed");
|
||||
}
|
||||
SmartRegistryHandle redis2;
|
||||
if (ERROR_SUCCESS != RegOpenKeyA(application, cRedis.c_str(), redis2)) {
|
||||
if (ERROR_SUCCESS != RegCreateKeyA(application, cRedis.c_str(), redis2)) {
|
||||
throw std::system_error(GetLastError(), system_category(), "RegCreateKeyA failed");
|
||||
}
|
||||
}
|
||||
type = REG_DWORD;
|
||||
size = 0;
|
||||
if (ERROR_SUCCESS != RegQueryValueExA(redis2, cTypesSupported.c_str(), 0, &type, NULL, &size)) {
|
||||
if (ERROR_SUCCESS != RegSetValueExA(redis2, cTypesSupported.c_str(), 0, REG_DWORD, (const BYTE*)&value, sizeof(DWORD))) {
|
||||
throw std::system_error(GetLastError(), system_category(), "RegSetValueExA failed");
|
||||
}
|
||||
}
|
||||
if (ERROR_SUCCESS != RegQueryValueExA(redis2, cEventMessageFile.c_str(), 0, &type, NULL, &size)) {
|
||||
if (ERROR_SUCCESS != RegSetValueExA(redis2, cEventMessageFile.c_str(), 0, REG_SZ, (BYTE*)appPath.c_str(), (DWORD)appPath.length())) {
|
||||
throw std::system_error(GetLastError(), system_category(), "RegSetValueExA failed");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void RedisEventLog::LogMessageToEventLog(LPCSTR msg, const WORD type) {
|
||||
DWORD eventID;
|
||||
switch (type) {
|
||||
case EVENTLOG_ERROR_TYPE:
|
||||
eventID = MSG_ERROR_1;
|
||||
break;
|
||||
case EVENTLOG_WARNING_TYPE:
|
||||
eventID = MSG_WARNING_1;
|
||||
break;
|
||||
case EVENTLOG_INFORMATION_TYPE:
|
||||
eventID = MSG_INFO_1;
|
||||
break;
|
||||
default:
|
||||
std::cerr << "Unrecognized type: " << type << "\n";
|
||||
eventID = MSG_INFO_1;
|
||||
break;
|
||||
}
|
||||
DWORD eventID;
|
||||
switch (type) {
|
||||
case EVENTLOG_ERROR_TYPE:
|
||||
eventID = MSG_ERROR_1;
|
||||
break;
|
||||
case EVENTLOG_WARNING_TYPE:
|
||||
eventID = MSG_WARNING_1;
|
||||
break;
|
||||
case EVENTLOG_INFORMATION_TYPE:
|
||||
eventID = MSG_INFO_1;
|
||||
break;
|
||||
default:
|
||||
std::cerr << "Unrecognized type: " << type << "\n";
|
||||
eventID = MSG_INFO_1;
|
||||
break;
|
||||
}
|
||||
|
||||
HANDLE hEventLog = RegisterEventSourceA(0, this->eventLogName.c_str());
|
||||
HANDLE hEventLog = RegisterEventSourceA(0, this->eventLogName.c_str());
|
||||
|
||||
if (0 == hEventLog) {
|
||||
std::cerr << "Failed open source '" << this->eventLogName << "': " << GetLastError() << endl;
|
||||
} else {
|
||||
if (FALSE == ReportEventA( hEventLog, type, 0, eventID, 0, 1, 0, &msg, 0)) {
|
||||
std::cerr << "Failed to write message: " << GetLastError() << endl;
|
||||
}
|
||||
if (0 == hEventLog) {
|
||||
std::cerr << "Failed open source '" << this->eventLogName << "': " << GetLastError() << endl;
|
||||
} else {
|
||||
if (FALSE == ReportEventA( hEventLog, type, 0, eventID, 0, 1, 0, &msg, 0)) {
|
||||
std::cerr << "Failed to write message: " << GetLastError() << endl;
|
||||
}
|
||||
|
||||
DeregisterEventSource(hEventLog);
|
||||
}
|
||||
DeregisterEventSource(hEventLog);
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" void WriteEventLog(const char* sysLogInstance, const char* msg) {
|
||||
try {
|
||||
stringstream ss;
|
||||
try {
|
||||
stringstream ss;
|
||||
ss << "syslog-ident = " << sysLogInstance << endl;
|
||||
ss << msg;
|
||||
RedisEventLog().LogMessageToEventLog(ss.str().c_str(),EVENTLOG_INFORMATION_TYPE);
|
||||
} catch (...) {
|
||||
}
|
||||
RedisEventLog().LogMessageToEventLog(ss.str().c_str(),EVENTLOG_INFORMATION_TYPE);
|
||||
} catch (...) {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -28,29 +28,29 @@ using namespace std;
|
||||
|
||||
typedef class RedisEventLog {
|
||||
public:
|
||||
~RedisEventLog() {}
|
||||
~RedisEventLog() {}
|
||||
|
||||
void InstallEventLogSource(string appPath);
|
||||
void UninstallEventLogSource();
|
||||
void InstallEventLogSource(string appPath);
|
||||
void UninstallEventLogSource();
|
||||
|
||||
void LogMessageToEventLog(LPCSTR msg, const WORD type);
|
||||
void LogMessageToEventLog(LPCSTR msg, const WORD type);
|
||||
|
||||
private:
|
||||
|
||||
const string eventLogName = "redis";
|
||||
const string cEventLogPath = "SYSTEM\\CurrentControlSet\\Services\\EventLog\\";
|
||||
const string cEventLogApplicitonPath = cEventLogPath + "Application\\";
|
||||
const string cRedis = "redis";
|
||||
const string cEventMessageFile = "EventMessageFile";
|
||||
const string cRedisServer = "redis-server";
|
||||
const string cTypesSupported = "TypesSupported";
|
||||
const string cApplication = "Application";
|
||||
const string eventLogName = "redis";
|
||||
const string cEventLogPath = "SYSTEM\\CurrentControlSet\\Services\\EventLog\\";
|
||||
const string cEventLogApplicitonPath = cEventLogPath + "Application\\";
|
||||
const string cRedis = "redis";
|
||||
const string cEventMessageFile = "EventMessageFile";
|
||||
const string cRedisServer = "redis-server";
|
||||
const string cTypesSupported = "TypesSupported";
|
||||
const string cApplication = "Application";
|
||||
} RedisEventLog;
|
||||
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
void WriteEventLog(const char* sysLogInstance, const char* msg);
|
||||
void WriteEventLog(const char* sysLogInstance, const char* msg);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user