Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
HdbTdbArchivingApi
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software Control System
Tango controls archiving
HdbTdbArchivingApi
Commits
275f2428
Commit
275f2428
authored
Nov 6, 2023
by
Raphael GIRARDOT
Browse files
Options
Downloads
Patches
Plain Diff
log message bug correction
parent
4501eb19
Branches
Branches containing commit
Tags
1.54.0
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/fr/soleil/archiving/hdbtdb/api/manager/ArchivingManagerApiRef.java
+29
-30
29 additions, 30 deletions
.../archiving/hdbtdb/api/manager/ArchivingManagerApiRef.java
with
29 additions
and
30 deletions
src/main/java/fr/soleil/archiving/hdbtdb/api/manager/ArchivingManagerApiRef.java
+
29
−
30
View file @
275f2428
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment