diff options
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/thrift/server')
-rw-r--r-- | src/main/java/org/openslx/imagemaster/thrift/server/BinaryListener.java | 1 | ||||
-rw-r--r-- | src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java | 25 |
2 files changed, 22 insertions, 4 deletions
diff --git a/src/main/java/org/openslx/imagemaster/thrift/server/BinaryListener.java b/src/main/java/org/openslx/imagemaster/thrift/server/BinaryListener.java index 19a8a24..ebacbfc 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/server/BinaryListener.java +++ b/src/main/java/org/openslx/imagemaster/thrift/server/BinaryListener.java @@ -31,6 +31,7 @@ public class BinaryListener implements Runnable TServer server = new THsHaServer( args ); log.info( "Starting Binary Thrift" ); server.serve(); + System.exit(1); } } diff --git a/src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java b/src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java index af78258..fe878ce 100644 --- a/src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java +++ b/src/main/java/org/openslx/imagemaster/thrift/server/ImageServerHandler.java @@ -13,6 +13,7 @@ import org.openslx.imagemaster.thrift.iface.ImageData; import org.openslx.imagemaster.thrift.iface.ImageDataException; import org.openslx.imagemaster.thrift.iface.ImageServer; import org.openslx.imagemaster.thrift.iface.InvalidTokenException; +import org.openslx.imagemaster.thrift.iface.OrganizationData; import org.openslx.imagemaster.thrift.iface.ServerAuthenticationException; import org.openslx.imagemaster.thrift.iface.ServerSessionData; import org.openslx.imagemaster.thrift.iface.SessionData; @@ -23,12 +24,9 @@ import org.openslx.imagemaster.thrift.iface.UserInfo; public class ImageServerHandler implements ImageServer.Iface { - private static Logger log = Logger.getLogger( ImageServerHandler.class ); - @Override public boolean ping() throws TException { - log.debug( "Ping..." ); // Return false if service unavailable but running return true; } @@ -63,7 +61,8 @@ public class ImageServerHandler implements ImageServer.Iface } @Override - public UploadData submitImage( String serverSessionId, ImageData imageDescription, List<Integer> crcSums ) throws AuthorizationException, ImageDataException, UploadException, TException + public UploadData submitImage( String serverSessionId, ImageData imageDescription, List<Integer> crcSums ) + throws AuthorizationException, ImageDataException, UploadException, TException { return ApiServer.submitImage( serverSessionId, imageDescription, crcSums ); } @@ -79,4 +78,22 @@ public class ImageServerHandler implements ImageServer.Iface { return ApiServer.isServerAuthenticated( serverSessionId ); } + + @Override + public List<OrganizationData> getOrganizations() throws TException + { + return ApiServer.getOrganizations(); + } + + @Override + public List<UserInfo> findUser( String sessionId, String organizationId, String searchTerm ) throws TException + { + return ApiServer.findUser( sessionId, organizationId, searchTerm ); + } + + @Override + public boolean publishUser( String serverSessionId, UserInfo user ) throws TException + { + return ApiServer.publishUser( serverSessionId, user ); + } } |