Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Logging: status changed from Startup to Activate and Shutdown to Deactivate #302

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DeviceInfo/DeviceInfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ namespace Plugin {
_deviceInfo = _service->Root<Exchange::IDeviceInfo>(_connectionId, 2000, _T("DeviceInfoImplementation"));
if (_deviceInfo == nullptr) {
message = _T("DeviceInfo could not be instantiated");
SYSLOG(Logging::Startup, (_T("DeviceInfo could not be instantiated")));
SYSLOG(Logging::Activate, (_T("DeviceInfo could not be instantiated")));
} else {
_deviceInfo->Configure(_service);
_deviceAudioCapabilityInterface = _deviceInfo->QueryInterface<Exchange::IDeviceAudioCapabilities>();
Expand Down
2 changes: 1 addition & 1 deletion DisplayInfo/DisplayInfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ namespace Plugin {
// if it hasn't been initialized.
_displayProperties = _connectionProperties->QueryInterface<Exchange::IDisplayProperties>();
if (_displayProperties == nullptr) {
SYSLOG(Logging::Startup, (_T("Display Properties service is unavailable.")));
SYSLOG(Logging::Activate, (_T("Display Properties service is unavailable.")));
} else {
Exchange::JDisplayProperties::Register(*this, _displayProperties);
}
Expand Down
2 changes: 1 addition & 1 deletion LocationSync/LocationSync.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ POP_WARNING()
_adminLock.Unlock();

Exchange::JTimeZone::Event::TimeZoneChanged(const_cast<PluginHost::JSONRPC&>(static_cast<const PluginHost::JSONRPC&>(*this)), timezone);
SYSLOG(Logging::Startup, (_T("TimeZone change to \"%s\", local date time is now %s."), timezone.c_str(), Core::Time::Now().ToRFC1123(true).c_str()));
SYSLOG(Logging::Notification, (_T("TimeZone change to \"%s\", local date time is now %s."), timezone.c_str(), Core::Time::Now().ToRFC1123(true).c_str()));
}

void LocationSync::SetLocationSubsystem(PluginHost::ISubSystem& subsystem, bool update) /* cannot be const due to subsystem Set*/ {
Expand Down
2 changes: 1 addition & 1 deletion Monitor/Monitor.h
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@ POP_WARNING()
restartWindow = element.Restart.Window;
restartLimit = element.Restart.Limit;
}
SYSLOG(Logging::Startup, (_T("Monitoring: %s (%d,%d)."), callSign.c_str(), (interval / 1000000), (memory / 1000000)));
SYSLOG(Logging::Activate, (_T("Monitoring: %s (%d,%d)."), callSign.c_str(), (interval / 1000000), (memory / 1000000)));
if ((interval != 0) || (memory != 0)) {

_monitor.emplace(std::piecewise_construct,
Expand Down
8 changes: 4 additions & 4 deletions OpenCDMi/FrameworkRPC.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1293,7 +1293,7 @@ POP_WARNING()
}
}
} else {
SYSLOG(Logging::Startup, (_T("Could not load factory [%s], error [%s]"), Core::File::FileNameExtended(entry.Current()).c_str(), library.Error().c_str()));
SYSLOG(Logging::Activate, (_T("Could not load factory [%s], error [%s]"), Core::File::FileNameExtended(entry.Current()).c_str(), library.Error().c_str()));
result = Core::ERROR_OPENING_FAILED;
}
}
Expand All @@ -1317,7 +1317,7 @@ POP_WARNING()
_systemToFactory.insert(std::pair<const std::string, SystemFactory>(designator, factory->second));

} else {
SYSLOG(Logging::Startup, (_T("Required factory [%s], not found for [%s]"), system.c_str(), designator.c_str()));
SYSLOG(Logging::Activate, (_T("Required factory [%s], not found for [%s]"), system.c_str(), designator.c_str()));
result = Core::ERROR_OPENING_FAILED;
}
}
Expand All @@ -1340,7 +1340,7 @@ POP_WARNING()
}

if (_systemToFactory.size() == 0) {
SYSLOG(Logging::Startup, (_T("No DRM factories specified. OCDM can not service any DRM requests.")));
SYSLOG(Logging::Activate, (_T("No DRM factories specified. OCDM can not service any DRM requests.")));
}

if ((config.Group.IsSet() == true) && (config.Group.Value().empty() == false)){
Expand Down Expand Up @@ -1371,7 +1371,7 @@ POP_WARNING()
subSystem->Set(PluginHost::ISubSystem::DECRYPTION, this);
}
if (_systemToFactory.size() == 0) {
SYSLOG(Logging::Startup, (string(_T("OCDM server has NO key systems registered!!!"))));
SYSLOG(Logging::Activate, (string(_T("OCDM server has NO key systems registered!!!"))));
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion PlayerInfo/PlayerInfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ namespace Plugin {
// if it hasn't been initialized.
_dolbyOut = _player->QueryInterface<Exchange::Dolby::IOutput>();
if (_dolbyOut == nullptr) {
SYSLOG(Logging::Startup, (_T("Dolby output switching service is unavailable.")));
SYSLOG(Logging::Activate, (_T("Dolby output switching service is unavailable.")));
} else {
_dolbyNotification.Initialize(_dolbyOut);
Exchange::Dolby::JOutput::Register(*this, _dolbyOut);
Expand Down
6 changes: 3 additions & 3 deletions SecurityAgent/SecurityAgent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,11 @@ namespace Plugin {
if (_acl.Load(aclFile) == Core::ERROR_INCOMPLETE_CONFIG) {
AccessControlList::Iterator index(_acl.Unreferenced());
while (index.Next()) {
SYSLOG(Logging::Startup, (_T("Role: %s not referenced"), index.Current().c_str()));
SYSLOG(Logging::Activate, (_T("Role: %s not referenced"), index.Current().c_str()));
}
index = _acl.Undefined();
while (index.Next()) {
SYSLOG(Logging::Startup, (_T("Role: %s is undefined"), index.Current().c_str()));
SYSLOG(Logging::Activate, (_T("Role: %s is undefined"), index.Current().c_str()));
}
}
}
Expand Down Expand Up @@ -159,7 +159,7 @@ namespace Plugin {
Core::SinkType<SecurityCallsign> information(callsign);

if (subSystem->IsActive(PluginHost::ISubSystem::SECURITY) != false) {
SYSLOG(Logging::Startup, (_T("Security is not defined as External !!")));
SYSLOG(Logging::Activate, (_T("Security is not defined as External !!")));
}

subSystem->Set(PluginHost::ISubSystem::SECURITY, &information);
Expand Down
Loading