Better code organization

Author: EtienneM

main.go

@@ -3,33 +3,24 @@ package main
 import (
 	"flag"
 	"fmt"
-	"log"
-	"net"
-	"net/http"
 	"os"
 	"os/signal"
 	"syscall"
 
-	"github.com/Scalingo/sample-influxdb/config"
-	"github.com/dghubble/go-twitter/twitter"
-	"github.com/dghubble/oauth1"
-	"github.com/go-martini/martini"
-	"github.com/martini-contrib/render"
+	"github.com/Scalingo/sample-influxdb/utils"
+	"github.com/Scalingo/sample-influxdb/webserver"
+	"github.com/Scalingo/sample-influxdb/worker"
 )
 
-type Closer interface {
-	Close() error
-}
-
 func main() {
 	flagIsWorker := flag.Bool("worker", false, "is a worker")
 	flag.Parse()
 
-	var closer Closer
+	var closer utils.Closer
 	if *flagIsWorker {
-		closer = startWorker()
+		closer = worker.Start()
 	} else {
-		closer = startServer()
+		closer = webserver.Start()
 	}
 
 	sigs := make(chan os.Signal)
@@ -40,74 +31,3 @@ func main() {
 		_ = closer.Close()
 	}
 }
-
-func startServer() Closer {
-	m := martini.Classic()
-	m.Use(render.Renderer(
-		render.Options{
-			Directory: "templates",
-		},
-	))
-
-	m.Get("/", func(r render.Render) {
-		r.HTML(200, "index", nil)
-	})
-
-	port := "3000"
-	if os.Getenv("PORT") != "" {
-		port = os.Getenv("PORT")
-	}
-
-	listener, err := net.Listen("tcp", ":"+port)
-	if err != nil {
-		panic(err)
-	}
-
-	go http.Serve(listener, m)
-	log.Println("Listening on 0.0.0.0:" + port)
-	return listener
-}
-
-func startWorker() Closer {
-	conf := oauth1.NewConfig(config.E["TWITTER_CONSUMER_KEY"], config.E["TWITTER_CONSUMER_SECRET"])
-	token := oauth1.NewToken(config.E["TWITTER_ACCESS_TOKEN"], config.E["TWITTER_ACCESS_SECRET"])
-	// OAuth1 http.Client will automatically authorize Requests
-	httpClient := conf.Client(oauth1.NoContext, token)
-
-	// Twitter Client
-	client := twitter.NewClient(httpClient)
-	_ = client
-	demux := twitter.NewSwitchDemux()
-	_ = demux
-	demux.Tweet = func(tweet *twitter.Tweet) {
-		fmt.Println(tweet.Text)
-	}
-	demux.DM = func(dm *twitter.DirectMessage) {
-		fmt.Println(dm.SenderID)
-	}
-	demux.Event = func(event *twitter.Event) {
-		fmt.Printf("%#v\n", event)
-	}
-	fmt.Println("Starting Stream...")
-
-	// FILTER
-	filterParams := &twitter.StreamFilterParams{
-		Track:         []string{"#Travail"},
-		StallWarnings: twitter.Bool(true),
-	}
-	stream, err := client.Streams.Filter(filterParams)
-	if err != nil {
-		log.Fatal(err)
-	}
-	// Receive messages until stopped or stream quits
-	go demux.HandleChan(stream.Messages)
-
-	// Wait for SIGINT and SIGTERM (HIT CTRL-C)
-	ch := make(chan os.Signal)
-	signal.Notify(ch, syscall.SIGINT, syscall.SIGTERM)
-	log.Println(<-ch)
-
-	fmt.Println("Stopping Stream...")
-	stream.Stop()
-	return nil
-}

utils/Closer.go

@@ -0,0 +1,5 @@
+package utils
+
+type Closer interface {
+	Close() error
+}

webserver/webserver.go

@@ -0,0 +1,39 @@
+package webserver
+
+import (
+	"log"
+	"net"
+	"net/http"
+	"os"
+
+	"github.com/Scalingo/sample-influxdb/utils"
+	"github.com/go-martini/martini"
+	"github.com/martini-contrib/render"
+)
+
+func Start() utils.Closer {
+	m := martini.Classic()
+	m.Use(render.Renderer(
+		render.Options{
+			Directory: "templates",
+		},
+	))
+
+	m.Get("/", func(r render.Render) {
+		r.HTML(200, "index", nil)
+	})
+
+	port := "3000"
+	if os.Getenv("PORT") != "" {
+		port = os.Getenv("PORT")
+	}
+
+	listener, err := net.Listen("tcp", ":"+port)
+	if err != nil {
+		panic(err)
+	}
+
+	go http.Serve(listener, m)
+	log.Println("Listening on 0.0.0.0:" + port)
+	return listener
+}

worker/worker.go

@@ -0,0 +1,57 @@
+package worker
+
+import (
+	"fmt"
+	"log"
+
+	"github.com/Scalingo/sample-influxdb/config"
+	"github.com/Scalingo/sample-influxdb/utils"
+	"github.com/dghubble/go-twitter/twitter"
+	"github.com/dghubble/oauth1"
+)
+
+type workerCloser struct {
+	stream *twitter.Stream
+}
+
+func (w workerCloser) Close() error {
+	w.stream.Stop()
+	return nil
+}
+
+func Start() utils.Closer {
+	conf := oauth1.NewConfig(config.E["TWITTER_CONSUMER_KEY"], config.E["TWITTER_CONSUMER_SECRET"])
+	token := oauth1.NewToken(config.E["TWITTER_ACCESS_TOKEN"], config.E["TWITTER_ACCESS_SECRET"])
+	// OAuth1 http.Client will automatically authorize Requests
+	httpClient := conf.Client(oauth1.NoContext, token)
+
+	// Twitter Client
+	client := twitter.NewClient(httpClient)
+	demux := twitter.NewSwitchDemux()
+	demux.Tweet = func(tweet *twitter.Tweet) {
+		fmt.Println(tweet.Text)
+	}
+	demux.DM = func(dm *twitter.DirectMessage) {
+		fmt.Println(dm.SenderID)
+	}
+	demux.Event = func(event *twitter.Event) {
+		fmt.Printf("%#v\n", event)
+	}
+	fmt.Println("Starting Stream...")
+
+	filterParams := &twitter.StreamFilterParams{
+		Track:         []string{"#osezdirenon"},
+		StallWarnings: twitter.Bool(true),
+	}
+	stream, err := client.Streams.Filter(filterParams)
+	if err != nil {
+		log.Fatal(err)
+	}
+	closer := workerCloser{
+		stream: stream,
+	}
+	// Receive messages until stopped or stream quits
+	go demux.HandleChan(stream.Messages)
+
+	return closer
+}