jdb/new-life-songs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update code and build for deployment to ElasticBeanstalk.

Browse Source
This commit is contained in:
Jonathan Bernard
2016-12-17 13:22:57 -06:00
parent 409469c624
commit a132f6540c
6 changed files with 66 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/groovy/com/jdbernard/nlsongs/servlet/NLSongsContext.groovy
View File

@ -7,7 +7,7 @@ import com.jdbernard.nlsongs.model.Song
public class NLSongsContext {
public static NLSongsDB songsDB
public static String mediaBaseUrl
public static String makeUrl(Service service, Song song) {

25
src/main/groovy/com/jdbernard/nlsongs/servlet/NLSongsContextListener.groovy
View File

@ -9,16 +9,31 @@ import com.jdbernard.nlsongs.db.NLSongsDB
import com.zaxxer.hikari.HikariConfig
import com.zaxxer.hikari.HikariDataSource
import org.slf4j.Logger
import org.slf4j.LoggerFactory
public final class NLSongsContextListener implements ServletContextListener {
private static final log = LoggerFactory.getLogger(NLSongsContextListener)
public void contextInitialized(ServletContextEvent event) {
def context = event.servletContext
// Load the context configuration.
Properties props = new Properties()
NLSongsContextListener.getResourceAsStream(
context.getInitParameter('context.config.file')).withStream { is ->
props.load(is) }
// Load database details from the context configuration.
String contextConfigFile = context.getInitParameter('context.config.file')
if (contextConfigFile) {
NLSongsContextListener.getResourceAsStream(contextConfigFile)
.withStream { is -> props.load(is) } }
// Load database configuration from environment variables (may
// override settings in file).
def env = System.getenv()
env.keySet().findAll { it.startsWith('DB_') }.each { key ->
props[key.substring(3)] = env[key] }
log.debug("Database configuration: {}", props)
// Create the pooled data source
HikariConfig hcfg = new HikariConfig(
@ -39,6 +54,6 @@ public final class NLSongsContextListener implements ServletContextListener {
// Shutdown the Songs DB instance (it will shut down the data source).
NLSongsDB songsDB = context.getAttribute('songsDB')
if (songsDB) songsDB.shutdown()
context.removeAttribute('songsDB') }
}