NPM/numass-framework
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Server update

Browse Source
This commit is contained in:
Alexander Nozik 2017-05-25 19:49:43 +03:00
parent b06b2bc746
commit 3987c07040
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
numass-control/cryotemp/src/main/java/inr/numass/cryotemp/PKT8Device.java
View File

@ -160,7 +160,7 @@ public class PKT8Device extends PortSensor<PKT8Result> {
public void shutdown() throws ControlException { public void shutdown() throws ControlException {
storageHelper.close(); storageHelper.close();
if (collector != null) { if (collector != null) {
collector.clear(); collector.stop();
collector = null; collector = null;
} }
super.shutdown(); super.shutdown();

4
numass-server/src/main/java/inr/numass/server/TestServer.java
View File

@ -8,7 +8,7 @@ package inr.numass.server;
import hep.dataforge.context.Context; import hep.dataforge.context.Context;
import hep.dataforge.context.Global; import hep.dataforge.context.Global;
import hep.dataforge.server.ServerManager; import hep.dataforge.server.ServerManager;
import hep.dataforge.server.storage.StorageServeUtils; import hep.dataforge.server.storage.StorageServerUtils;
import hep.dataforge.storage.commons.StorageManager; import hep.dataforge.storage.commons.StorageManager;
import hep.dataforge.storage.filestorage.FileStorageFactory; import hep.dataforge.storage.filestorage.FileStorageFactory;
import inr.numass.storage.NumassStorage; import inr.numass.storage.NumassStorage;
@ -36,7 +36,7 @@ public class TestServer {
context.getLogger().info("Starting test numass storage servlet in '{}'", path); context.getLogger().info("Starting test numass storage servlet in '{}'", path);
NumassStorage storage = new NumassStorage(context, FileStorageFactory.buildStorageMeta(path, true, true)); NumassStorage storage = new NumassStorage(context, FileStorageFactory.buildStorageMeta(path, true, true));
StorageServeUtils.addStorage(serverManager,storage,"numass-storage"); StorageServerUtils.addStorage(serverManager,storage,"numass-storage");
serverManager.startServer(); serverManager.startServer();