diff --git a/PlayWallServer.iml b/PlayWallServer.iml index 573336cbcf608944ec92d87cacb33e03f98be606..7f3dfa768e820705d0294b0e6d89f9d8fe5beda7 100644 --- a/PlayWallServer.iml +++ b/PlayWallServer.iml @@ -12,7 +12,7 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="Maven: org.scala-lang:scala-library:2.13.0-M2" level="project" /> + <orderEntry type="library" name="Maven: org.scala-lang:scala-library:2.12.4" level="project" /> <orderEntry type="library" name="Maven: com.sparkjava:spark-core:2.6.0" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.4.4.v20170414" level="project" /> @@ -30,11 +30,12 @@ <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-client:9.4.4.v20170414" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-servlet:9.4.4.v20170414" level="project" /> <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-api:9.4.4.v20170414" level="project" /> + <orderEntry type="library" name="Maven: com.sparkjava:spark-debug-tools:0.5" level="project" /> <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.0.13" level="project" /> <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.0.13" level="project" /> <orderEntry type="library" name="Maven: com.j256.ormlite:ormlite-core:5.0" level="project" /> <orderEntry type="library" name="Maven: com.j256.ormlite:ormlite-jdbc:5.0" level="project" /> <orderEntry type="library" name="Maven: mysql:mysql-connector-java:6.0.5" level="project" /> - <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.1" level="project" /> + <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.2" level="project" /> </component> </module> \ No newline at end of file diff --git a/pom.xml b/pom.xml index 4835d864e8d4a0c8ef8d5f85d83d44e678b4bba1..c56f1c2d1dd092baea51e0cf2d0b945e03289f3a 100644 --- a/pom.xml +++ b/pom.xml @@ -87,13 +87,20 @@ <dependency> <groupId>org.scala-lang</groupId> <artifactId>scala-library</artifactId> - <version>LATEST</version> + <version>2.12.4</version> </dependency> + <dependency> <groupId>com.sparkjava</groupId> <artifactId>spark-core</artifactId> <version>2.6.0</version> </dependency> + <dependency> + <groupId>com.sparkjava</groupId> + <artifactId>spark-debug-tools</artifactId> + <version>0.5</version> + </dependency> + <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> diff --git a/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala b/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala index 273b690f273f3a31a3b8ebe771e6d69f32ab8ffb..de3d8fcee038f51128e07f1ac24671c90c097a93 100644 --- a/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala +++ b/src/main/scala/de/tobias/playpad/server/PlayPadServer.scala @@ -16,7 +16,6 @@ import de.tobias.playpad.server.server.project.sync.ProjectSyncHandler import de.tobias.playpad.server.settings.SettingsHandler import de.tobias.playpad.server.transformer.JsonTransformer import spark.Spark._ -import spark.route.RouteOverview /** * Created by tobias on 29.01.17. @@ -82,12 +81,8 @@ object PlayPadServer extends App { get("/sessions", new SessionGet(accountDao), new JsonTransformer) // DEBUG - exception(classOf[Exception], (exception, _, _) => { - exception.printStackTrace() - halt(500, s"internal error: ${exception.getLocalizedMessage}") - }) + // DebugScreen.enableDebugScreen() - RouteOverview.enableRouteOverview() SettingsHandler.saver.save(settings, settingsPath) Runtime.getRuntime.addShutdownHook(new Thread(() => { diff --git a/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala b/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala index 3e54d12751c40fbd654df65c0e7e07be31bd10d7..4a9b4421d502d72ba919ebd933084a0f8aa3dd70 100644 --- a/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala +++ b/src/main/scala/de/tobias/playpad/server/server/project/sync/ProjectSyncHandler.scala @@ -63,7 +63,7 @@ import scala.collection.{Map, mutable} this.sessions += (s.getAccount -> new mutable.HashSet[Session]()) } this.sessions(s.getAccount) += serverSession - case None => serverSession.close(500, "Invalid Key") + case None => serverSession.disconnect() } }