projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
🔀 Merge “next” into “feature/notification-handlers”
[Sone.git]
/
src
/
main
/
kotlin
/
net
/
pterodactylus
/
sone
/
main
/
SoneModule.kt
diff --git
a/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt
b/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt
index
6a349eb
..
749de0d
100644
(file)
--- a/
src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt
+++ b/
src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt
@@
-1,5
+1,6
@@
package net.pterodactylus.sone.main
package net.pterodactylus.sone.main
+import com.codahale.metrics.*
import com.google.common.base.*
import com.google.common.eventbus.*
import com.google.inject.*
import com.google.common.base.*
import com.google.common.eventbus.*
import com.google.inject.*
@@
-8,13
+9,20
@@
import com.google.inject.name.Names.*
import com.google.inject.spi.*
import net.pterodactylus.sone.database.*
import net.pterodactylus.sone.database.memory.*
import com.google.inject.spi.*
import net.pterodactylus.sone.database.*
import net.pterodactylus.sone.database.memory.*
+import net.pterodactylus.sone.freenet.*
import net.pterodactylus.sone.freenet.wot.*
import net.pterodactylus.util.config.*
import net.pterodactylus.util.config.ConfigurationException
import net.pterodactylus.sone.freenet.wot.*
import net.pterodactylus.util.config.*
import net.pterodactylus.util.config.ConfigurationException
+import net.pterodactylus.util.logging.*
import net.pterodactylus.util.version.Version
import java.io.*
import net.pterodactylus.util.version.Version
import java.io.*
+import java.util.concurrent.*
+import java.util.concurrent.Executors.*
+import java.util.logging.*
+import javax.inject.*
+import javax.inject.Singleton
-
class SoneModule(private val sonePlugin: SonePlugin
) : AbstractModule() {
+
open class SoneModule(private val sonePlugin: SonePlugin, private val eventBus: EventBus
) : AbstractModule() {
override fun configure() {
val sonePropertiesFile = File("sone.properties")
override fun configure() {
val sonePropertiesFile = File("sone.properties")
@@
-35,7
+43,6
@@
class SoneModule(private val sonePlugin: SonePlugin) : AbstractModule() {
.getValue(null)
?.let { DebugLoaders(it) }
}
.getValue(null)
?.let { DebugLoaders(it) }
}
- val eventBus = EventBus()
bind(Configuration::class.java).toInstance(configuration)
bind(EventBus::class.java).toInstance(eventBus)
bind(Configuration::class.java).toInstance(configuration)
bind(EventBus::class.java).toInstance(eventBus)
@@
-49,15
+56,30
@@
class SoneModule(private val sonePlugin: SonePlugin) : AbstractModule() {
bind(PluginYear::class.java).toInstance(PluginYear(sonePlugin.year))
bind(PluginHomepage::class.java).toInstance(PluginHomepage(sonePlugin.homepage))
bind(Database::class.java).to(MemoryDatabase::class.java).`in`(Singleton::class.java)
bind(PluginYear::class.java).toInstance(PluginYear(sonePlugin.year))
bind(PluginHomepage::class.java).toInstance(PluginHomepage(sonePlugin.homepage))
bind(Database::class.java).to(MemoryDatabase::class.java).`in`(Singleton::class.java)
+ bind(Translation::class.java).toInstance(BaseL10nTranslation(sonePlugin.l10n().base))
loaders?.let { bind(Loaders::class.java).toInstance(it) }
loaders?.let { bind(Loaders::class.java).toInstance(it) }
+ bind(MetricRegistry::class.java).`in`(Singleton::class.java)
+ bind(WebOfTrustConnector::class.java).to(PluginWebOfTrustConnector::class.java).`in`(Singleton::class.java)
+ bind(TickerShutdown::class.java).`in`(Singleton::class.java)
bindListener(Matchers.any(), object : TypeListener {
override fun <I> hear(typeLiteral: TypeLiteral<I>, typeEncounter: TypeEncounter<I>) {
bindListener(Matchers.any(), object : TypeListener {
override fun <I> hear(typeLiteral: TypeLiteral<I>, typeEncounter: TypeEncounter<I>) {
- typeEncounter.register(InjectionListener { injectee -> eventBus.register(injectee) })
+ typeEncounter.register(InjectionListener { injectee ->
+ logger.fine { "Injecting $injectee..." }
+ eventBus.register(injectee)
+ })
}
})
}
}
})
}
+ @Provides
+ @Singleton
+ @Named("notification")
+ fun getNotificationTicker(): ScheduledExecutorService =
+ newSingleThreadScheduledExecutor()
+
+ private val logger: Logger = Logging.getLogger(javaClass)
+
}
private fun String.parseVersion(): Version = Version.parse(this)
}
private fun String.parseVersion(): Version = Version.parse(this)