Skip to content
Snippets Groups Projects
Commit 320f3602 authored by Gwenaelle ABEILLE's avatar Gwenaelle ABEILLE
Browse files

state management

parent dbe26f55
No related branches found
No related tags found
No related merge requests found
...@@ -318,8 +318,7 @@ public class ArchivingManager extends DeviceImpl ...@@ -318,8 +318,7 @@ public class ArchivingManager extends DeviceImpl
* The device version * The device version
*/ */
// ========================================================= // =========================================================
ArchivingManager(final DeviceClass cl, final String s, final String d, final String version) ArchivingManager(final DeviceClass cl, final String s, final String d, final String version) throws DevFailed {
throws DevFailed {
super(cl, s, d); super(cl, s, d);
m_version = version; m_version = version;
init_device(); init_device();
...@@ -345,8 +344,7 @@ public class ArchivingManager extends DeviceImpl ...@@ -345,8 +344,7 @@ public class ArchivingManager extends DeviceImpl
if (hdbName == null) { if (hdbName == null) {
hdbManager.ArchivingConfigure(hdbUser, hdbPassword); hdbManager.ArchivingConfigure(hdbUser, hdbPassword);
} else { } else {
hdbManager.ArchivingConfigure(hdbHost, hdbName, hdbUser, hdbPassword, hdbManager.ArchivingConfigure(hdbHost, hdbName, hdbUser, hdbPassword, hdbRacConnection, false, false);
hdbRacConnection, false, false);
} }
} catch (final ArchivingException e) { } catch (final ArchivingException e) {
e.printStackTrace(); e.printStackTrace();
...@@ -359,8 +357,7 @@ public class ArchivingManager extends DeviceImpl ...@@ -359,8 +357,7 @@ public class ArchivingManager extends DeviceImpl
if (tdbName == null) { if (tdbName == null) {
tdbManager.ArchivingConfigure(tdbUser, tdbPassword); tdbManager.ArchivingConfigure(tdbUser, tdbPassword);
} else { } else {
tdbManager.ArchivingConfigure(tdbHost, tdbName, tdbUser, tdbPassword, tdbManager.ArchivingConfigure(tdbHost, tdbName, tdbUser, tdbPassword, tdbRacConnection, false, false);
tdbRacConnection, false, false);
} }
} catch (final ArchivingException e) { } catch (final ArchivingException e) {
e.printStackTrace(); e.printStackTrace();
...@@ -375,14 +372,11 @@ public class ArchivingManager extends DeviceImpl ...@@ -375,14 +372,11 @@ public class ArchivingManager extends DeviceImpl
if ((al = hdbManager.getArchiverListSize() == 0 && tdbManager.getArchiverListSize() == 0) if ((al = hdbManager.getArchiverListSize() == 0 && tdbManager.getArchiverListSize() == 0)
|| (db = !hdbManager.is_db_connected() && !tdbManager.is_db_connected())) { || (db = !hdbManager.is_db_connected() && !tdbManager.is_db_connected())) {
set_state(DevState.FAULT); set_state(DevState.FAULT);
set_status(device_name + " : DevState.FAULT" + "\r\n" set_status(device_name + " : DevState.FAULT" + "\r\n" + (db ? " No database connected ! " + "\r\n" : "")
+ (db ? " No database connected ! " + "\r\n" : "")
+ (al ? " No archiver available ! " + "\r\n" : "")); + (al ? " No archiver available ! " + "\r\n" : ""));
get_logger().error( get_logger().error(
"ERROR : " + (db ? " - No database connected ! " : "") "ERROR : " + (db ? " - No database connected ! " : "") + (al ? " - No archiver available ! " : ""));
+ (al ? " - No archiver available ! " : "")); } else if ((al = hdbManager.getArchiverListSize() == 0 || tdbManager.getArchiverListSize() == 0)
} else if ((al = hdbManager.getArchiverListSize() == 0
|| tdbManager.getArchiverListSize() == 0)
|| (db = !hdbManager.is_db_connected() || !tdbManager.is_db_connected())) { || (db = !hdbManager.is_db_connected() || !tdbManager.is_db_connected())) {
set_state(DevState.ALARM); set_state(DevState.ALARM);
set_status(device_name + " : DevState.ALARM" + "\r\n" set_status(device_name + " : DevState.ALARM" + "\r\n"
...@@ -416,8 +410,8 @@ public class ArchivingManager extends DeviceImpl ...@@ -416,8 +410,8 @@ public class ArchivingManager extends DeviceImpl
if (Util._UseDb == false) { if (Util._UseDb == false) {
return; return;
} }
final String[] propnames = { "HdbHost", "HdbName", "TdbHost", "TdbName", "HdbUser", final String[] propnames = { "HdbHost", "HdbName", "TdbHost", "TdbName", "HdbUser", "HdbPassword", "TdbUser",
"HdbPassword", "TdbUser", "TdbPassword", "HdbRacConnection", "TdbRacConnection" }; "TdbPassword", "HdbRacConnection", "TdbRacConnection" };
// Call database and extract values // Call database and extract values
// -------------------------------------------- // --------------------------------------------
...@@ -653,8 +647,7 @@ public class ArchivingManager extends DeviceImpl ...@@ -653,8 +647,7 @@ public class ArchivingManager extends DeviceImpl
final String reason = "Failed while executing ArchivingManager.archiving_configure() method..."; final String reason = "Failed while executing ArchivingManager.archiving_configure() method...";
final String message = GlobalConst.ARCHIVING_ERROR_PREFIX + " : "; final String message = GlobalConst.ARCHIVING_ERROR_PREFIX + " : ";
final ArchivingException e = new ArchivingException(message, reason, ErrSeverity.PANIC, final ArchivingException e = new ArchivingException(message, reason, ErrSeverity.PANIC, desc, "");
desc, "");
throw e.toTangoException(); throw e.toTangoException();
} }
} }
...@@ -758,8 +751,7 @@ public class ArchivingManager extends DeviceImpl ...@@ -758,8 +751,7 @@ public class ArchivingManager extends DeviceImpl
set_status(device_name + " : DevState.RUNNING"); set_status(device_name + " : DevState.RUNNING");
try { try {
final ArchivingMessConfig archivingMessConfig = ArchivingMessConfig final ArchivingMessConfig archivingMessConfig = ArchivingMessConfig.creationWithoutFullInformation(argin);
.creationWithoutFullInformation(argin);
hdbManager.ArchivingStart(archivingMessConfig); hdbManager.ArchivingStart(archivingMessConfig);
} catch (final ArchivingException e) { } catch (final ArchivingException e) {
e.printStackTrace(); e.printStackTrace();
...@@ -877,8 +869,7 @@ public class ArchivingManager extends DeviceImpl ...@@ -877,8 +869,7 @@ public class ArchivingManager extends DeviceImpl
// ---Add your Own code to control device here --- // ---Add your Own code to control device here ---
set_state(DevState.RUNNING); set_state(DevState.RUNNING);
set_status(device_name + " : DevState.RUNNING"); set_status(device_name + " : DevState.RUNNING");
final ArchivingMessConfig archivingMessConfig = ArchivingMessConfig final ArchivingMessConfig archivingMessConfig = ArchivingMessConfig.creationWithoutFullInformation(argin);
.creationWithoutFullInformation(argin);
try { try {
tdbManager.ArchivingStart(archivingMessConfig); tdbManager.ArchivingStart(archivingMessConfig);
} catch (final ArchivingException e) { } catch (final ArchivingException e) {
...@@ -910,11 +901,12 @@ public class ArchivingManager extends DeviceImpl ...@@ -910,11 +901,12 @@ public class ArchivingManager extends DeviceImpl
} catch (final ArchivingException e) { } catch (final ArchivingException e) {
get_logger().warn(e.toString(), e); get_logger().warn(e.toString(), e);
throw e.toTangoException(); throw e.toTangoException();
} } finally {
set_state(DevState.ON); set_state(DevState.ON);
set_status(device_name + " : DevState.ON"); set_status(device_name + " : DevState.ON");
get_logger().info("Exiting archiving_stop_hdb()"); get_logger().info("Exiting archiving_stop_hdb()");
} }
}
// ========================================================= // =========================================================
/** /**
...@@ -1039,8 +1031,7 @@ public class ArchivingManager extends DeviceImpl ...@@ -1039,8 +1031,7 @@ public class ArchivingManager extends DeviceImpl
// ---Add your Own code to control device here --- // ---Add your Own code to control device here ---
set_state(DevState.RUNNING); set_state(DevState.RUNNING);
set_status(device_name + " : DevState.RUNNING"); set_status(device_name + " : DevState.RUNNING");
final ArchivingMessConfig archivingMessConfig = ArchivingMessConfig final ArchivingMessConfig archivingMessConfig = ArchivingMessConfig.creationWithoutFullInformation(argin);
.creationWithoutFullInformation(argin);
try { try {
hdbManager.ArchivingStopConf(archivingMessConfig.getAttributeList()); hdbManager.ArchivingStopConf(archivingMessConfig.getAttributeList());
...@@ -1159,8 +1150,7 @@ public class ArchivingManager extends DeviceImpl ...@@ -1159,8 +1150,7 @@ public class ArchivingManager extends DeviceImpl
// ---Add your Own code to control device here --- // ---Add your Own code to control device here ---
set_state(DevState.RUNNING); set_state(DevState.RUNNING);
set_status(device_name + " : DevState.RUNNING"); set_status(device_name + " : DevState.RUNNING");
final ArchivingMessConfig archivingMessConfig = ArchivingMessConfig final ArchivingMessConfig archivingMessConfig = ArchivingMessConfig.creationWithoutFullInformation(argin);
.creationWithoutFullInformation(argin);
try { try {
tdbManager.ArchivingStopConf(archivingMessConfig.getAttributeList()); tdbManager.ArchivingStopConf(archivingMessConfig.getAttributeList());
archiving_start_tdb(argin); archiving_start_tdb(argin);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment