diff options
| author | Christian Pointner <equinox@anytun.org> | 2009-02-22 03:53:14 +0000 |
|---|---|---|
| committer | Christian Pointner <equinox@anytun.org> | 2009-02-22 03:53:14 +0000 |
| commit | 2fbd48f9f927dbd93974e8e6d985815331a12b15 (patch) | |
| tree | 1dfd1cd14f1ab125d0ec114fefb089fa763cb0ca /src/logTargets.cpp | |
| parent | added extended logging capability (diff) | |
fixed build on Windows (after logging chances)
Diffstat (limited to 'src/logTargets.cpp')
| -rw-r--r-- | src/logTargets.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/logTargets.cpp b/src/logTargets.cpp index 82bb6fd..ac41c0b 100644 --- a/src/logTargets.cpp +++ b/src/logTargets.cpp @@ -141,7 +141,7 @@ LogTarget* LogTargetList::add(target_type_t type, int prio, std::string conf) } case TARGET_WINEVENTLOG: { #ifdef LOG_WINEVENTLOG - if(!LogTargetSyslog::duplicateAllowed() && targets.count(TARGET_WINEVENTLOG)) + if(!LogTargetWinEventlog::duplicateAllowed() && targets.count(TARGET_WINEVENTLOG)) throw std::runtime_error(targetTypeToString(TARGET_WINEVENTLOG) + " logtarget is supported only once"); return targets.insert(TargetsMap::value_type(TARGET_WINEVENTLOG, new LogTargetWinEventlog(prio, conf)))->second; @@ -403,11 +403,11 @@ void LogTargetWinEventlog::log(std::string msg, int prio) CHAR buffer[STERROR_TEXT_MAX]; StringCchPrintfA(buffer, STERROR_TEXT_MAX, "%s", msg.c_str()); lpszStrings[0] = buffer; - if(log.h_event_source) - ReportEventA(log.h_event_source_, Log::prioToEventLogType(prio), 0, prio, NULL, 1, 0, lpszStrings, NULL); + if(h_event_source) + ReportEventA(h_event_source, prioToEventLogType(prio), 0, prio, NULL, 1, 0, lpszStrings, NULL); } -LogTargetEventlog& LogTargetWinEventlog::setLogName(std::string l) +LogTargetWinEventlog& LogTargetWinEventlog::setLogName(std::string l) { logname = l; if(opened) @@ -419,14 +419,14 @@ LogTargetEventlog& LogTargetWinEventlog::setLogName(std::string l) WORD LogTargetWinEventlog::prioToEventLogType(int prio) { switch(prio) { - case PRIO_EMERG: return EVENTLOG_ERROR_TYPE; - case PRIO_ALERT: return EVENTLOG_ERROR_TYPE; - case PRIO_CRIT: return EVENTLOG_ERROR_TYPE; - case PRIO_ERR: return EVENTLOG_ERROR_TYPE; - case PRIO_WARNING: return EVENTLOG_WARNING_TYPE; - case PRIO_NOTICE: return EVENTLOG_INFORMATION_TYPE; - case PRIO_INFO: return EVENTLOG_SUCCESS; - case PRIO_DEBUG: return EVENTLOG_INFORMATION_TYPE; + case Log::PRIO_EMERG: return EVENTLOG_ERROR_TYPE; + case Log::PRIO_ALERT: return EVENTLOG_ERROR_TYPE; + case Log::PRIO_CRIT: return EVENTLOG_ERROR_TYPE; + case Log::PRIO_ERR: return EVENTLOG_ERROR_TYPE; + case Log::PRIO_WARNING: return EVENTLOG_WARNING_TYPE; + case Log::PRIO_NOTICE: return EVENTLOG_INFORMATION_TYPE; + case Log::PRIO_INFO: return EVENTLOG_SUCCESS; + case Log::PRIO_DEBUG: return EVENTLOG_INFORMATION_TYPE; default: return EVENTLOG_ERROR_TYPE; } } |