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
daaceb2d
Commit
daaceb2d
authored
Sep 07, 2015
by
helene ortiz
Browse files
No commit message
No commit message
parent
f9f25fdd
Changes
4
Hide whitespace changes
Inline
Side-by-side
logviewer/.classpath
View file @
daaceb2d
...
...
@@ -7,5 +7,6 @@
<classpathentry
kind=
"lib"
path=
"lib64/logkit-2.0.jar"
/>
<classpathentry
kind=
"lib"
path=
"lib64/protobuf-2.5.0.jar"
/>
<classpathentry
kind=
"lib"
path=
"lib64/nappli-java-api.jar"
/>
<classpathentry
kind=
"lib"
path=
"lib64/jeromq-0.3.5.jar"
/>
<classpathentry
kind=
"output"
path=
"bin"
/>
</classpath>
logviewer/lib64/nappli-java-api.jar
View file @
daaceb2d
No preview for this file type
logviewer/src/fr/ill/ics/bridge/LogViewerManager.java
View file @
daaceb2d
...
...
@@ -17,7 +17,7 @@
*/
package
fr.ill.ics.bridge
;
import
fr.ill.ics.nappli.remote.Application.
Futur
e
;
import
fr.ill.ics.nappli.remote.Application.
Instanc
e
;
import
fr.ill.ics.nappli.remote.ConnectionTimeout
;
import
fr.ill.ics.nappli.remote.Server
;
...
...
@@ -31,7 +31,7 @@ public class LogViewerManager {
private
final
static
String
LOGVIEWER_APPLICATION_NAME
=
"nlv"
;
private
static
LogViewerManager
instance
=
null
;
private
Server
server
;
private
Futur
e
nomadLogViewer
;
private
Instanc
e
nomadLogViewer
;
/**
* The constructor must not be instantiated directly.
...
...
@@ -56,7 +56,7 @@ public class LogViewerManager {
public
void
start
(
String
authentication
,
String
cycleId
,
long
instrumentId
,
long
proposalId
)
{
String
[]
headers
=
new
String
[]
{
cycleId
,
instrumentId
+
""
,
proposalId
+
""
,
authentication
};
System
.
out
.
println
(
"starting log viewer with nappli ["
+
cycleId
+
", "
+
instrumentId
+
", "
+
proposalId
+
", "
+
authentication
+
"]"
);
System
.
out
.
println
(
"headers length "
+
headers
.
length
);
// Connect to the server
...
...
@@ -66,7 +66,7 @@ public class LogViewerManager {
// Start nomad log viewer
try
{
nomadLogViewer
=
server
.
start
(
LOGVIEWER_APPLICATION_NAME
,
headers
);
if
(
nomadLogViewer
.
exists
())
{
System
.
out
.
println
(
"started "
+
nomadLogViewer
);
}
...
...
@@ -80,13 +80,13 @@ public class LogViewerManager {
public
void
stop
()
{
if
(
nomadLogViewer
!=
null
)
{
System
.
out
.
println
(
"stopping application "
+
nomadLogViewer
.
getNameId
());
nomadLogViewer
.
stop
();
nomadLogViewer
=
null
;
// A déplacer sur la fermeture de NomadGUI !!!!!!
server
.
terminate
();
System
.
out
.
println
(
"stopping application "
+
nomadLogViewer
.
getNameId
());
nomadLogViewer
.
stop
();
nomadLogViewer
=
null
;
// A déplacer sur la fermeture de NomadGUI !!!!!!
server
.
terminate
();
}
}
}
logviewer/src/fr/ill/ics/nscclient/serverconnection/ServerDisconnected.java
View file @
daaceb2d
...
...
@@ -95,7 +95,7 @@ public class ServerDisconnected extends ServerConnectionState {
// start nomad server
try
{
Application
.
Futur
e
nomad
=
server
.
start
(
"ns"
);
Application
.
Instanc
e
nomad
=
server
.
start
(
"ns"
);
if
(
nomad
.
exists
())
{
System
.
out
.
println
(
"started "
+
nomad
);
}
...
...
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