From 14635c80ffdc96f43cace13cdfcb86e4816fa0ab Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Fri, 17 Jul 2015 15:45:46 +0200 Subject: some martini related cleanup diff --git a/Makefile b/Makefile index 96167f5..b1a116a 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ GOCMD := go getlibs: export GOPATH=$(curdir) getlibs: - $(GOCMD) get "github.com/codegangsta/martini" + $(GOCMD) get "github.com/go-martini/martini" $(GOCMD) get "github.com/gorilla/websocket" $(GOCMD) get "github.com/tuxychandru/pubsub" diff --git a/debian/rhrdtime.service b/debian/rhrdtime.service index 0d4658e..bfffdee 100644 --- a/debian/rhrdtime.service +++ b/debian/rhrdtime.service @@ -4,6 +4,7 @@ Description=Radio Helsinki Rivendell Time Websocket Server [Service] User=rhrdtime Group=rhrdtime +Environment="MARTINI_ENV=production" ExecStart=/usr/bin/rhrdtime Restart=always RestartSec=1s diff --git a/src/helsinki.at/rhrdtime/rhrdtime.go b/src/helsinki.at/rhrdtime/rhrdtime.go index 692882b..6677e97 100644 --- a/src/helsinki.at/rhrdtime/rhrdtime.go +++ b/src/helsinki.at/rhrdtime/rhrdtime.go @@ -32,7 +32,7 @@ import ( "net/http" "encoding/json" - "github.com/codegangsta/martini" + "github.com/go-martini/martini" "github.com/gorilla/websocket" "github.com/tuxychandru/pubsub" ) -- cgit v0.10.2