Fix #75

woohyeok-choi · Oct 23, 2020 · 15dc641 · 15dc641
1 parent 83fce1e
commit 15dc641
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/app/src/main/kotlin/kaist/iclab/abclogger/commons/Errors.kt b/app/src/main/kotlin/kaist/iclab/abclogger/commons/Errors.kt
@@ -285,8 +285,14 @@ open class CollectorError(
         qualifiedName = qualifiedName
     )
 
+    class TurningOnRequestWhenUnavailable(override val qualifiedName: String) : CollectorError(
+        R.string.error_collector_turning_on_request_when_unavailable,
+        qualifiedName = qualifiedName
+    )
+
     companion object {
         fun notFound(qualifiedName: String) = NotFound(qualifiedName)
+        fun turningOnRequestWhenUnavaiable(qualifiedName: String) = TurningOnRequestWhenUnavailable(qualifiedName)
         fun changeSettingDuringOperating(qualifiedName: String) =
             SettingChangedDuringOperating(qualifiedName)
     }

diff --git a/app/src/main/kotlin/kaist/iclab/abclogger/core/collector/AbstractCollector.kt b/app/src/main/kotlin/kaist/iclab/abclogger/core/collector/AbstractCollector.kt
@@ -114,6 +114,10 @@ abstract class AbstractCollector<E : AbstractEntity>(
     abstract suspend fun list(limit: Long): Collection<E>
 
     fun start() {
+        if (!isAvailable()) {
+            stop(CollectorError.turningOnRequestWhenUnavaiable(qualifiedName))
+        }
+
         isEnabled = true
 
         lastErrorMessage = ""
@@ -134,7 +138,7 @@ abstract class AbstractCollector<E : AbstractEntity>(
     /**
      * function stop is called only by a user's explicit interaction.
      */
-    fun stop() {
+    fun stop(throwable: Throwable? = null) {
         isEnabled = false
 
         turnedOnTime = Long.MIN_VALUE
@@ -143,6 +147,7 @@ abstract class AbstractCollector<E : AbstractEntity>(
 
         launch {
             onStop()
+            if (throwable != null) throw throwable
         }
 
         scope.cancel()

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -386,6 +386,7 @@
     <string name="error_collector">Collector error</string>
     <string name="error_collector_not_found">Corresponding collector not found.</string>
     <string name="error_collector_change_setting_during_operating">Cannot change settings during operating.</string>
+    <string name="error_collector_turning_on_request_when_unavailable">Invalid request for turning on a collector due to unavailability of data collection.</string>
 
 </resources>