Commit a15b9099 authored by Jörg Richter's avatar Jörg Richter

Further improve server log (#389)

parent 34b4b822
Pipeline #10501 passed with stages
in 8 minutes and 15 seconds
......@@ -495,8 +495,6 @@ public class AccessControlPlugin extends PluginActivator implements AccessContro
// Access Control plugin is stopped/started as well but at shutdown() time the Config service is already gone.
if (configService != null) {
configService.unregisterConfigDefinition(LOGIN_ENABLED);
} else {
logger.warning("Config service is already gone");
}
}
......
......@@ -430,15 +430,15 @@ public class PluginImpl implements Plugin, EventHandler {
private void addService(Object service, Class serviceInterface) {
if (service instanceof CoreService) {
logger.info("Adding DMX core service to " + this);
logger.fine("Adding DMX core service to " + this);
setCoreService((CoreServiceImpl) service);
publishWebResources();
publishRestResources();
} else if (service instanceof EventAdmin) {
logger.info("Adding Event Admin service to " + this);
logger.fine("Adding Event Admin service to " + this);
eventService = (EventAdmin) service;
} else {
logger.info("Adding " + serviceInterface.getName() + " to " + this);
logger.fine("Adding " + serviceInterface.getName() + " to " + this);
injectableServices.get(serviceInterface).injectService(service);
pluginContext.serviceArrived(service);
}
......@@ -446,17 +446,17 @@ public class PluginImpl implements Plugin, EventHandler {
private void removeService(Object service, Class serviceInterface) {
if (service == dmx) {
logger.info("Removing DMX core service from " + this);
logger.fine("Removing DMX core service from " + this);
unpublishRestResources();
unpublishWebResources();
unpublishFileSystem();
dmx.pluginManager.deactivatePlugin(this); // use plugin manager before core service is removed
setCoreService(null);
} else if (service == eventService) {
logger.info("Removing Event Admin service from " + this);
logger.fine("Removing Event Admin service from " + this);
eventService = null;
} else {
logger.info("Removing " + serviceInterface.getName() + " from " + this);
logger.fine("Removing " + serviceInterface.getName() + " from " + this);
pluginContext.serviceGone(service);
injectableServices.get(serviceInterface).injectService(null);
}
......
......@@ -109,10 +109,9 @@ class WebPublishingService {
void unpublishStaticResources(String uriNamespace) {
HttpService httpService = getHttpService();
// HTTP service might be gone already
if (httpService != null) {
httpService.unregister(uriNamespace);
} else {
logger.warning("HTTP service is already gone");
}
}
......@@ -254,10 +253,9 @@ class WebPublishingService {
logger.fine("########## Unregistering Jersey servlet at HTTP service (URI namespace=\"" +
ROOT_APPLICATION_PATH + "\")");
HttpService httpService = getHttpService();
// HTTP service might be gone already
if (httpService != null) {
httpService.unregister(ROOT_APPLICATION_PATH);
} else {
logger.warning("HTTP service is already gone");
}
isJerseyServletRegistered = false;
}
......
......@@ -177,7 +177,7 @@ public class CoreActivator implements BundleActivator {
private void addService(Object service) {
if (service instanceof HttpService) {
logger.info("Adding HTTP service to DMX Core");
logger.fine("Adding HTTP service to DMX Core");
httpService = (HttpService) service;
checkRequirementsForActivation();
}
......@@ -185,7 +185,7 @@ public class CoreActivator implements BundleActivator {
private void removeService(Object service) {
if (service == httpService) {
logger.info("Removing HTTP service from DMX Core");
logger.fine("Removing HTTP service from DMX Core");
httpService = null;
}
}
......
......@@ -449,8 +449,6 @@ public class FilesPlugin extends PluginActivator implements FilesService, Static
// Files plugin is stopped/started as well but at shutdown() time the Config service is already gone.
if (configService != null) {
configService.unregisterConfigDefinition("dmx.files.disk_quota");
} else {
logger.warning("Config service is already gone");
}
}
......
......@@ -292,8 +292,6 @@ public class WorkspacesPlugin extends PluginActivator implements WorkspacesServi
// Workspaces plugin is stopped/started as well but at shutdown() time the Config service is already gone.
if (configService != null) {
configService.unregisterConfigDefinition("dmx.workspaces.enabled_sharing_modes");
} else {
logger.warning("Config service is already gone");
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment