InsanusMokrassar/tgbotapi
1
0
Fork 0
mirror of https://github.com/InsanusMokrassar/TelegramBotAPI.git synced 2024-11-22 16:23:48 +00:00
Code Releases Activity

now requests executor in updates poller is strong

Browse Source
This commit is contained in:
InsanusMokrassar 2019-03-11 11:00:38 +08:00
parent 7d028f854d
commit 1afa870f6d
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/extensions/UpdatesPoller.kt
View File

@ -11,16 +11,13 @@ import com.github.insanusmokrassar.TelegramBotAPI.utils.toMediaGroupUpdate
import kotlinx.coroutines.* import kotlinx.coroutines.*
import java.util.concurrent.Executors import java.util.concurrent.Executors
private val updatesPollerRequestExecutorCollectedException = IllegalStateException("RequestsExecutor was collected by GC. Can't continue getting updates by polling")
class UpdatesPoller( class UpdatesPoller(
requestsExecutor: RequestsExecutor, private val executor: RequestsExecutor,
private val requestsDelayMillis: Long = 1000, private val requestsDelayMillis: Long = 1000,
private val scope: CoroutineScope = CoroutineScope(Executors.newFixedThreadPool(4).asCoroutineDispatcher()), private val scope: CoroutineScope = CoroutineScope(Executors.newFixedThreadPool(4).asCoroutineDispatcher()),
private val allowedUpdates: List<String>? = null, private val allowedUpdates: List<String>? = null,
private val block: UpdateReceiver<Any> private val block: UpdateReceiver<Any>
) { ) {
private val executor = requestsExecutor.asReference()
private var lastHandledUpdate: UpdateIdentifier = 0L private var lastHandledUpdate: UpdateIdentifier = 0L
private val mediaGroup: MutableList<MediaGroupUpdate> = mutableListOf() private val mediaGroup: MutableList<MediaGroupUpdate> = mutableListOf()
@ -51,14 +48,14 @@ class UpdatesPoller(
} }
private suspend fun getUpdates(): List<Update> { private suspend fun getUpdates(): List<Update> {
return executor.get() ?.execute( return executor.execute(
GetUpdates( GetUpdates(
lastHandledUpdate + 1, // incremented because offset counted from 1 when updates id from 0 lastHandledUpdate + 1, // incremented because offset counted from 1 when updates id from 0
allowed_updates = allowedUpdates allowed_updates = allowedUpdates
) )
) ?.map { ) ?.map {
it.asUpdate it.asUpdate
} ?: throw updatesPollerRequestExecutorCollectedException }
} }
private suspend fun handleUpdates(updates: List<Update>) { private suspend fun handleUpdates(updates: List<Update>) {
@ -82,9 +79,6 @@ class UpdatesPoller(
try { try {
handleUpdates(getUpdates()) handleUpdates(getUpdates())
} catch (e: Exception) { } catch (e: Exception) {
if (e == updatesPollerRequestExecutorCollectedException) {
throw IllegalArgumentException(e.message)
}
e.printStackTrace() e.printStackTrace()
} }
} }