summaryrefslogtreecommitdiffstats
path: root/Dozentenmodulserver
diff options
context:
space:
mode:
authorunknown2014-04-02 17:37:51 +0200
committerunknown2014-04-02 17:37:51 +0200
commit20730f37f213a07f990bcb928a9e23f871d49d29 (patch)
tree31f47c331337a3c6ce7564b64ee8f4d8e2d4a1e6 /Dozentenmodulserver
parentUploader angepasst, Thrift connection mit system.out.println versehen (diff)
downloadtutor-module-20730f37f213a07f990bcb928a9e23f871d49d29.tar.gz
tutor-module-20730f37f213a07f990bcb928a9e23f871d49d29.tar.xz
tutor-module-20730f37f213a07f990bcb928a9e23f871d49d29.zip
Diverse kleine Bugfixes
Diffstat (limited to 'Dozentenmodulserver')
-rw-r--r--Dozentenmodulserver/bin/server/BinaryListener.classbin2110 -> 2151 bytes
-rw-r--r--Dozentenmodulserver/bin/server/ServerHandler.classbin9540 -> 9540 bytes
-rw-r--r--Dozentenmodulserver/bin/server/startServer.classbin1609 -> 1889 bytes
-rw-r--r--Dozentenmodulserver/src/server/BinaryListener.java3
-rw-r--r--Dozentenmodulserver/src/server/ServerHandler.java1
-rw-r--r--Dozentenmodulserver/src/server/startServer.java5
6 files changed, 6 insertions, 3 deletions
diff --git a/Dozentenmodulserver/bin/server/BinaryListener.class b/Dozentenmodulserver/bin/server/BinaryListener.class
index 30db4102..8635e9d8 100644
--- a/Dozentenmodulserver/bin/server/BinaryListener.class
+++ b/Dozentenmodulserver/bin/server/BinaryListener.class
Binary files differ
diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class
index 3e78390a..4bb45a96 100644
--- a/Dozentenmodulserver/bin/server/ServerHandler.class
+++ b/Dozentenmodulserver/bin/server/ServerHandler.class
Binary files differ
diff --git a/Dozentenmodulserver/bin/server/startServer.class b/Dozentenmodulserver/bin/server/startServer.class
index bd79ab19..9788373f 100644
--- a/Dozentenmodulserver/bin/server/startServer.class
+++ b/Dozentenmodulserver/bin/server/startServer.class
Binary files differ
diff --git a/Dozentenmodulserver/src/server/BinaryListener.java b/Dozentenmodulserver/src/server/BinaryListener.java
index 7c546fee..7d8b94b5 100644
--- a/Dozentenmodulserver/src/server/BinaryListener.java
+++ b/Dozentenmodulserver/src/server/BinaryListener.java
@@ -20,12 +20,13 @@ public class BinaryListener implements Runnable
final TServerTransport transport;
try {
transport = new TServerSocket( 9090 );
+ log.info("Connected to Port 9090");
} catch ( TTransportException e ) {
log.fatal( "Could not listen on port 9090" );
return;
}
TServer server = new TSimpleServer( new Args( transport ).processor( processor ) );
- log.info("Starting TSimpleServer");
+ log.info("Starting Running Server");
server.serve();
}
diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java
index 44f0c216..dccda971 100644
--- a/Dozentenmodulserver/src/server/ServerHandler.java
+++ b/Dozentenmodulserver/src/server/ServerHandler.java
@@ -211,6 +211,7 @@ public class ServerHandler implements Server.Iface {
System.out.println("Vor Move" +new Date());
try {
+ //der übergebene Filename ist falsch - hier muss der generierte name geholt werden, nicht der ursprüngliche name. wo wird dieser eingelesen?
FileUtils.moveFile(tmpFile, new File("141.79.128.103:/srv/nfs4slx/"+tmpFile.getName()));
} catch (IOException e) {
// TODO Auto-generated catch block
diff --git a/Dozentenmodulserver/src/server/startServer.java b/Dozentenmodulserver/src/server/startServer.java
index 46b9a2f1..7a93183d 100644
--- a/Dozentenmodulserver/src/server/startServer.java
+++ b/Dozentenmodulserver/src/server/startServer.java
@@ -1,6 +1,7 @@
package server;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import org.apache.log4j.BasicConfigurator;
@@ -22,7 +23,7 @@ public class startServer {
public static void main(String[] args) {
BasicConfigurator.configure();
- log.info( "Starting Application" );
+ log.info( new Date() + ", starting Application\n" );
Thread t;
t = new Thread(new BinaryListener());
servers.add(t);
@@ -41,7 +42,7 @@ public class startServer {
}
}
}
- log.info( "All Servers shut down, exiting..." );
+ log.info( new Date()+", all Servers shut down, exiting...\n" );
}