Skip to content
Snippets Groups Projects
Commit 275f2428 authored by Raphael GIRARDOT's avatar Raphael GIRARDOT
Browse files

log message bug correction

parent 4501eb19
Branches
Tags 1.54.0
No related merge requests found
...@@ -3,6 +3,24 @@ ...@@ -3,6 +3,24 @@
*/ */
package fr.soleil.archiving.hdbtdb.api.manager; package fr.soleil.archiving.hdbtdb.api.manager;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.ScheduledExecutorService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.tango.utils.DevFailedUtils;
import fr.esrf.Tango.DevFailed; import fr.esrf.Tango.DevFailed;
import fr.esrf.Tango.ErrSeverity; import fr.esrf.Tango.ErrSeverity;
import fr.esrf.TangoApi.ApiUtil; import fr.esrf.TangoApi.ApiUtil;
...@@ -31,22 +49,6 @@ import fr.soleil.archiving.hdbtdb.api.tools.LoadBalancedList; ...@@ -31,22 +49,6 @@ import fr.soleil.archiving.hdbtdb.api.tools.LoadBalancedList;
import fr.soleil.archiving.hdbtdb.api.tools.mode.Mode; import fr.soleil.archiving.hdbtdb.api.tools.mode.Mode;
import fr.soleil.database.connection.AbstractDataBaseConnector; import fr.soleil.database.connection.AbstractDataBaseConnector;
import fr.soleil.tango.clientapi.TangoAttribute; import fr.soleil.tango.clientapi.TangoAttribute;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.tango.utils.DevFailedUtils;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.ScheduledExecutorService;
/** /**
* @author AYADI * @author AYADI
...@@ -187,8 +189,7 @@ public abstract class ArchivingManagerApiRef implements IArchivingManagerApiRef ...@@ -187,8 +189,7 @@ public abstract class ArchivingManagerApiRef implements IArchivingManagerApiRef
* @param attributeName * @param attributeName
* @return AttributeInfo * @return AttributeInfo
*/ */
public static AttributeInfo getAttributeInfo(final String attributeName, final boolean doRefresh) throws public static AttributeInfo getAttributeInfo(final String attributeName, final boolean doRefresh) throws DevFailed {
DevFailed {
AttributeInfo att_info = null; AttributeInfo att_info = null;
if (!doRefresh) { if (!doRefresh) {
att_info = getBufferedAttributeInfo(attributeName); att_info = getBufferedAttributeInfo(attributeName);
...@@ -468,7 +469,6 @@ public abstract class ArchivingManagerApiRef implements IArchivingManagerApiRef ...@@ -468,7 +469,6 @@ public abstract class ArchivingManagerApiRef implements IArchivingManagerApiRef
return count; return count;
} }
protected abstract String getHost(); protected abstract String getHost();
protected abstract String getUser(); protected abstract String getUser();
...@@ -537,7 +537,6 @@ public abstract class ArchivingManagerApiRef implements IArchivingManagerApiRef ...@@ -537,7 +537,6 @@ public abstract class ArchivingManagerApiRef implements IArchivingManagerApiRef
this.exportedArchiverList = exportedArchiverList; this.exportedArchiverList = exportedArchiverList;
} }
private void initDbArchiverList() throws ArchivingException { private void initDbArchiverList() throws ArchivingException {
if (archiverListRefresher != null && !archiverListRefresher.isCancelled()) { if (archiverListRefresher != null && !archiverListRefresher.isCancelled()) {
archiverListRefresher.cancel(true); archiverListRefresher.cancel(true);
...@@ -574,8 +573,7 @@ public abstract class ArchivingManagerApiRef implements IArchivingManagerApiRef ...@@ -574,8 +573,7 @@ public abstract class ArchivingManagerApiRef implements IArchivingManagerApiRef
.add((facility ? "//" + dbase.get_tango_host() + "/" : "") + reply.dev_name()); .add((facility ? "//" + dbase.get_tango_host() + "/" : "") + reply.dev_name());
} }
} }
exportedArchiverList = runningDevicesListVector exportedArchiverList = runningDevicesListVector.toArray(new String[runningDevicesListVector.size()]);
.toArray(new String[runningDevicesListVector.size()]);
notExportedArchiverList = notRunningDevicesListVector notExportedArchiverList = notRunningDevicesListVector
.toArray(new String[notRunningDevicesListVector.size()]); .toArray(new String[notRunningDevicesListVector.size()]);
LOGGER.debug("will manage {} archivers, {} are down", runningDevicesListVector, LOGGER.debug("will manage {} archivers, {} are down", runningDevicesListVector,
...@@ -697,7 +695,8 @@ public abstract class ArchivingManagerApiRef implements IArchivingManagerApiRef ...@@ -697,7 +695,8 @@ public abstract class ArchivingManagerApiRef implements IArchivingManagerApiRef
deviceData.insert(messConfigArray); deviceData.insert(messConfigArray);
final DeviceProxy archiverProxy = new DeviceProxy(archiver); final DeviceProxy archiverProxy = new DeviceProxy(archiver);
archiverProxy.set_timeout_millis(TANGO_TIMEOUT); archiverProxy.set_timeout_millis(TANGO_TIMEOUT);
LOGGER.info("starting {} on {}", archiverArchivingMessConfig.getAttributeList(), archiver); LOGGER.info("starting {} on {}", Arrays.toString(archiverArchivingMessConfig.getAttributeList()),
archiver);
archiverProxy.command_inout(ARCHIVINGSTART, deviceData); archiverProxy.command_inout(ARCHIVINGSTART, deviceData);
} catch (final DevFailed devFailed) { } catch (final DevFailed devFailed) {
LOGGER.error("start archiving failed {}", devFailed); LOGGER.error("start archiving failed {}", devFailed);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment