diff options
| -rw-r--r-- | Dozentenmodul/bin/Models/Image.class | bin | 2387 -> 2387 bytes | |||
| -rw-r--r-- | Dozentenmodul/bin/Models/Lecture.class | bin | 2226 -> 2226 bytes | |||
| -rw-r--r-- | Dozentenmodul/bin/Models/person.class | bin | 2032 -> 2032 bytes | |||
| -rw-r--r-- | Dozentenmodul/src/Models/Image.java | 3 | ||||
| -rw-r--r-- | Dozentenmodul/src/Models/Lecture.java | 3 | ||||
| -rw-r--r-- | Dozentenmodul/src/Models/person.java | 5 | ||||
| -rw-r--r-- | Dozentenmodulserver/bin/server/BinaryListener.class | bin | 3002 -> 3344 bytes | |||
| -rw-r--r-- | Dozentenmodulserver/bin/util/XMLCreator.class | bin | 7557 -> 7558 bytes | |||
| -rw-r--r-- | Dozentenmodulserver/src/server/BinaryListener.java | 46 |
9 files changed, 26 insertions, 31 deletions
diff --git a/Dozentenmodul/bin/Models/Image.class b/Dozentenmodul/bin/Models/Image.class Binary files differindex 59b34fab..0167c7c5 100644 --- a/Dozentenmodul/bin/Models/Image.class +++ b/Dozentenmodul/bin/Models/Image.class diff --git a/Dozentenmodul/bin/Models/Lecture.class b/Dozentenmodul/bin/Models/Lecture.class Binary files differindex a0cb753d..31755bcf 100644 --- a/Dozentenmodul/bin/Models/Lecture.class +++ b/Dozentenmodul/bin/Models/Lecture.class diff --git a/Dozentenmodul/bin/Models/person.class b/Dozentenmodul/bin/Models/person.class Binary files differindex 36fa9761..ef2a89eb 100644 --- a/Dozentenmodul/bin/Models/person.class +++ b/Dozentenmodul/bin/Models/person.class diff --git a/Dozentenmodul/src/Models/Image.java b/Dozentenmodul/src/Models/Image.java index 0b3c936e..e08ed5a2 100644 --- a/Dozentenmodul/src/Models/Image.java +++ b/Dozentenmodul/src/Models/Image.java @@ -1,9 +1,9 @@ package models; public class Image { + private String ImageId; private String version; - private String imagename; private String newName; private String imagepath; @@ -12,7 +12,6 @@ public class Image { private int ram; private int cpu; private long filesize; - public static Image image =new Image(); diff --git a/Dozentenmodul/src/Models/Lecture.java b/Dozentenmodul/src/Models/Lecture.java index 6b7e6fa1..eae05ec5 100644 --- a/Dozentenmodul/src/Models/Lecture.java +++ b/Dozentenmodul/src/Models/Lecture.java @@ -4,7 +4,6 @@ import java.util.Date; public class Lecture { - private String name; private String newName; private String shortDesc; @@ -14,8 +13,6 @@ public class Lecture { private boolean active; private String id; private String linkedImagename; - - public static Lecture lecture =new Lecture(); diff --git a/Dozentenmodul/src/Models/person.java b/Dozentenmodul/src/Models/person.java index 67b6b84e..0f14af51 100644 --- a/Dozentenmodul/src/Models/person.java +++ b/Dozentenmodul/src/Models/person.java @@ -3,9 +3,7 @@ package models; public class person{ - private String username; - private String Name; private String Vorname; private String Hochschule; @@ -13,11 +11,8 @@ public class person{ private String Tel; private String Fakultaet; private boolean ischecked; - - //public static person verantowrtlicher=new person(); public static person verantwortlicher=new person(); - public String getUsername() { return username; } diff --git a/Dozentenmodulserver/bin/server/BinaryListener.class b/Dozentenmodulserver/bin/server/BinaryListener.class Binary files differindex 81db32c2..3518f758 100644 --- a/Dozentenmodulserver/bin/server/BinaryListener.class +++ b/Dozentenmodulserver/bin/server/BinaryListener.class diff --git a/Dozentenmodulserver/bin/util/XMLCreator.class b/Dozentenmodulserver/bin/util/XMLCreator.class Binary files differindex cfdf6004..0c9c6d45 100644 --- a/Dozentenmodulserver/bin/util/XMLCreator.class +++ b/Dozentenmodulserver/bin/util/XMLCreator.class diff --git a/Dozentenmodulserver/src/server/BinaryListener.java b/Dozentenmodulserver/src/server/BinaryListener.java index acf92a89..172b910b 100644 --- a/Dozentenmodulserver/src/server/BinaryListener.java +++ b/Dozentenmodulserver/src/server/BinaryListener.java @@ -11,34 +11,38 @@ import org.apache.thrift.transport.TServerSocket; import org.apache.thrift.transport.TServerTransport; import org.apache.thrift.transport.TTransportException; -public class BinaryListener implements Runnable -{ - private static Logger log = Logger.getLogger( BinaryListener.class ); +public class BinaryListener implements Runnable { + private static Logger log = Logger.getLogger(BinaryListener.class); + + private final int MINWORKERTHREADS = 20; // keine ahnung ob das passt... + private final int MAXWORKERTHREADS = 80; // ebenso @Override - public void run() - { + public void run() { final ServerHandler handler = new ServerHandler(); - final Server.Processor<ServerHandler> processor = new Server.Processor<ServerHandler>( handler ); + final Server.Processor<ServerHandler> processor = new Server.Processor<ServerHandler>( + handler); final TServerTransport transport; - final TProtocolFactory protFactory = new TBinaryProtocolSafe.Factory( true, true ); + final TProtocolFactory protFactory = new TBinaryProtocolSafe.Factory( + true, true); try { - transport = new TServerSocket( 9090 ); - log.info(new Date()+" - Connected to Port 9090"); - } catch ( TTransportException e ) { - log.fatal( new Date() +" - Could not listen on port 9090" ); + transport = new TServerSocket(9090); + log.info(new Date() + " - Connected to Port 9090"); + + } catch (TTransportException e) { + log.fatal(new Date() + " - Could not listen on port 9090"); return; } - //TServer server = new TSimpleServer( new Args( transport ).processor( processor ) ); - //TServer server = new TThreadPoolServer( new Args( transport ).protocolFactory( protFactory ).processor( processor ).minWorkerThreads( 4 ).maxWorkerThreads( 8 ) ); - //TServer server = new TThreadPoolServer( new Args( transport ).protocolFactory( protFactory ).processor( processor ) ); - //TThreadPoolServer server = new TThreadPoolServer( new Args( transport ).protocolFactory( protFactory ).processor( processor ).minWorkerThreads( 4 ).maxWorkerThreads( 8 ) ); - - TServer server = new TThreadPoolServer( new Args( transport ).protocolFactory( protFactory ).processor( processor ).minWorkerThreads( 4 ).maxWorkerThreads( 8 ) ); - - log.info(new Date() +" - Started running BinaryListener"); + TServer server = new TThreadPoolServer(new Args(transport) + .protocolFactory(protFactory).processor(processor) + .minWorkerThreads(MINWORKERTHREADS) + .maxWorkerThreads(MAXWORKERTHREADS)); + + log.info(new Date() + " - Started running BinaryListener"); + log.info(new Date() + " - MINWORKERTHREADS=" + MINWORKERTHREADS + + " and MAXWORKERTHREADS=" + MAXWORKERTHREADS+"\n"); server.serve(); - + } - + } |