Temporarily disable local pruning

thewca · Feb 18, 2020 · 1189a8c · 1189a8c
1 parent 24e71e5
commit 1189a8c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 9 deletions.
diff --git a/...n/org/worldcubeassociation/tnoodle/server/cloudscrambles/GoogleServerEnvironmentConfig.kt b/...n/org/worldcubeassociation/tnoodle/server/cloudscrambles/GoogleServerEnvironmentConfig.kt
@@ -33,6 +33,8 @@ object GoogleServerEnvironmentConfig : ServerEnvironmentConfig {
         get() = CONFIG_DATA.getOrNull(1)
             ?: DEVEL_VERSION
 
+    override val usePruning = true
+
     override fun pruningTableExists(tableName: String): Boolean {
         val blobId = remotePruningBlob(tableName)
         return GCS_SERVICE.get(blobId)?.exists() ?: false

diff --git a/...r/src/main/kotlin/org/worldcubeassociation/tnoodle/server/util/ServerEnvironmentConfig.kt b/...r/src/main/kotlin/org/worldcubeassociation/tnoodle/server/util/ServerEnvironmentConfig.kt
@@ -10,6 +10,8 @@ interface ServerEnvironmentConfig {
     val projectTitle
         get() = "$projectName-$version"
 
+    val usePruning: Boolean
+
     fun pruningTableExists(tableName: String): Boolean
 
     fun getPruningTableInput(tableName: String): InputStream

diff --git a/...rc/main/kotlin/org/worldcubeassociation/tnoodle/server/webscrambles/WebscramblesServer.kt b/...rc/main/kotlin/org/worldcubeassociation/tnoodle/server/webscrambles/WebscramblesServer.kt
@@ -30,15 +30,7 @@ class WebscramblesServer(val environmentConfig: ServerEnvironmentConfig) : Appli
 
         val wcifHandler = WcifHandler(environmentConfig)
 
-        if (environmentConfig.pruningTableExists(THREEPHASE_PRUNING)) {
-            DataInputStream(environmentConfig.getPruningTableInput(THREEPHASE_PRUNING)).use {
-                Tools.initFrom(it)
-            }
-        } else {
-            DataOutputStream(environmentConfig.getPruningTableOutput(THREEPHASE_PRUNING)).use {
-                Tools.saveTo(it)
-            }
-        }
+        initPruning()
 
         app.routing {
             PuzzleListHandler.install(this)
@@ -54,6 +46,20 @@ class WebscramblesServer(val environmentConfig: ServerEnvironmentConfig) : Appli
         baseServer.spinUp(app)
     }
 
+    private fun initPruning() {
+        if (environmentConfig.usePruning) {
+            if (environmentConfig.pruningTableExists(THREEPHASE_PRUNING)) {
+                DataInputStream(environmentConfig.getPruningTableInput(THREEPHASE_PRUNING)).use {
+                    Tools.initFrom(it)
+                }
+            } else {
+                DataOutputStream(environmentConfig.getPruningTableOutput(THREEPHASE_PRUNING)).use {
+                    Tools.saveTo(it)
+                }
+            }
+        }
+    }
+
     companion object {
         const val MIN_HEAP_SIZE_MEGS = 512
 

diff --git a/...g/worldcubeassociation/tnoodle/server/webscrambles/server/LocalServerEnvironmentConfig.kt b/...g/worldcubeassociation/tnoodle/server/webscrambles/server/LocalServerEnvironmentConfig.kt
@@ -17,6 +17,9 @@ object LocalServerEnvironmentConfig : ServerEnvironmentConfig {
         get() = LocalServerEnvironmentConfig::class.java.getPackage()?.implementationVersion
             ?: DEVEL_VERSION
 
+    override val usePruning: Boolean
+        get() = System.getenv("CI") != null
+
     private fun getPruningTableCache(assertExists: Boolean = true): File {
         val baseDir = File(programDirectory, PRUNING_FOLDER)