Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Instrument Control
NomadCommandSystem
Commits
83f9c1dc
Commit
83f9c1dc
authored
Aug 13, 2020
by
helene ortiz
Browse files
Get NomadServerEndpoint from ServerInstance instead of ConfigManager
(the latter does not take account of main/remote client types)
parent
b5740287
Changes
4
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
83f9c1dc
4.0.31 13/08/2020
------
* Get NomadServerEndpoint from ServerInstance instead of ConfigManager (the latter does not take account of main/remote client types)
4.0.29 27/07/2020
------
* Correct bug command line request after token integration
...
...
pom.xml
View file @
83f9c1dc
...
...
@@ -2,7 +2,7 @@
<modelVersion>
4.0.0
</modelVersion>
<groupId>
fr.ill.ics
</groupId>
<artifactId>
nomadcommandsystem
</artifactId>
<version>
4.0.3
0
</version>
<version>
4.0.3
1-SNAPSHOT
</version>
<name>
NomadCommandSystem
</name>
<description>
Java bridge for the communication with the Nomad server
</description>
<scm>
...
...
src/main/java/fr/ill/ics/nscclient/ploty/PlotyInstance.java
View file @
83f9c1dc
...
...
@@ -34,6 +34,7 @@ import fr.ill.ics.cameo.ConnectionTimeout;
import
fr.ill.ics.cameo.RequesterCreationException
;
import
fr.ill.ics.cameo.Server
;
import
fr.ill.ics.core.property.Property
;
import
fr.ill.ics.nscclient.serverconnection.ServerInstance
;
import
fr.ill.ics.nscclient.sessionmanagement.SessionManager
;
import
fr.ill.ics.ploty.DataPlotMessages
;
import
fr.ill.ics.ploty.DataPlotMessages.ClientInfo
;
...
...
@@ -85,13 +86,6 @@ public class PlotyInstance {
Application
.
Instance
ploty
=
null
;
String
nomadServerEndpoint
;
if
(
ConfigManager
.
getInstance
().
isMainClient
())
{
nomadServerEndpoint
=
ConfigManager
.
getInstance
().
getNomadServerEndpoint
();
}
else
{
// nomad endpoint is build from selected instrument
nomadServerEndpoint
=
"tcp://"
+
SessionManager
.
getInstance
(
CommandZoneWrapper
.
SERVER_ID
).
getInstrumentName
()
+
":7000"
;
}
// Client on a different machine as server
List
<
Info
>
info
=
server
.
getApplicationInfos
(
PLOTY_NAME
);
if
(
info
.
isEmpty
()
==
false
)
{
...
...
@@ -100,7 +94,7 @@ public class PlotyInstance {
// restart ploty2
try
{
String
arg
[]
=
{
n
omadServerEndpoint
};
String
arg
[]
=
{
ServerInstance
.
getInstance
().
getN
omadServerEndpoint
()
};
ploty
=
server
.
start
(
PLOTY_NAME
,
arg
);
}
catch
(
ConnectionTimeout
e
)
{
System
.
err
.
println
(
"Timeout while starting "
+
PLOTY_NAME
);
...
...
src/main/java/fr/ill/ics/util/ConfigManager.java
View file @
83f9c1dc
...
...
@@ -606,6 +606,10 @@ public class ConfigManager {
return
"tcp://localhost:7000"
;
}
/**
* Returns the endpoint of the server for main clients.
* @return
*/
public
String
getNomadServerEndpoint
()
{
String
nomadServerEndpoint
=
getStringOrNothingAtAll
(
"nomadServerEndpoint"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment