From 71139043b1affb1fdb21b0bb85f6a223a8743dc2 Mon Sep 17 00:00:00 2001
From: Eric Martindale <eric@ericmartindale.com>
Date: Sun, 8 Jul 2018 16:58:58 -0400
Subject: [PATCH] Allow port number to be configured via param, config file

---
 .../t3chguy/matrix-static/matrix-static.go    | 27 ++++++++++++++++++-
 .../matrix-static/mxclient/mxclient.go        |  1 +
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/github.com/t3chguy/matrix-static/matrix-static.go b/src/github.com/t3chguy/matrix-static/matrix-static.go
index d487618..1ad0d12 100644
--- a/src/github.com/t3chguy/matrix-static/matrix-static.go
+++ b/src/github.com/t3chguy/matrix-static/matrix-static.go
@@ -16,6 +16,7 @@ package main
 
 import (
 	"bytes"
+	"encoding/json"
 	"flag"
 	log "github.com/Sirupsen/logrus"
 	"github.com/disintegration/letteravatar"
@@ -30,6 +31,7 @@ import (
 	"github.com/t3chguy/matrix-static/templates"
 	"github.com/t3chguy/matrix-static/utils"
 	"image/png"
+	"io/ioutil"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -47,6 +49,7 @@ const RoomMembersPageSize = 20
 type configVars struct {
 	ConfigFile string
 	NumWorkers int
+	PortNumber int
 
 	PublicServePrefix       string
 	EnablePrometheusMetrics bool
@@ -60,6 +63,7 @@ func main() {
 
 	flag.StringVar(&config.ConfigFile, "config-file", "./config.json", "The path to the desired config file.")
 	flag.IntVar(&config.NumWorkers, "num-workers", 32, "Number of Worker goroutines to start.")
+	flag.IntVar(&config.PortNumber, "port", 8000, "TCP port number on which to listen for HTTP connections.")
 
 	flag.StringVar(&config.PublicServePrefix, "public-serve-prefix", "/", "Prefix for publicly accessible routes.")
 	flag.BoolVar(&config.EnablePrometheusMetrics, "enable-prometheus-metrics", false, "Whether or not to enable the /metrics endpoint.")
@@ -341,9 +345,30 @@ func main() {
 		})
 	}
 
+	// The struct representing the json config file format.
+	type Config struct {
+		AccessToken  string `json:"access_token"`
+		DeviceID     string `json:"device_id"`
+		HomeServer   string `json:"home_server"`
+		RefreshToken string `json:"refresh_token"`
+		UserID       string `json:"user_id"`
+		MediaBaseUrl string `json:"media_base_url"`
+		PortNumber   int `json:"port"`
+	}
+
+	var innerConfig Config
+
 	port := os.Getenv("PORT")
+
 	if port == "" {
-		port = "8000"
+		file, err := ioutil.ReadFile(config.ConfigFile)
+		if err != nil {
+			// return nil, err
+		}
+
+		json.Unmarshal(file, &innerConfig)
+
+		port = strconv.Itoa(innerConfig.PortNumber)
 	}
 
 	go startForwardPaginator(workers)
diff --git a/src/github.com/t3chguy/matrix-static/mxclient/mxclient.go b/src/github.com/t3chguy/matrix-static/mxclient/mxclient.go
index 7aab6c2..5c2deb3 100644
--- a/src/github.com/t3chguy/matrix-static/mxclient/mxclient.go
+++ b/src/github.com/t3chguy/matrix-static/mxclient/mxclient.go
@@ -116,6 +116,7 @@ type Config struct {
 	RefreshToken string `json:"refresh_token"`
 	UserID       string `json:"user_id"`
 	MediaBaseUrl string `json:"media_base_url"`
+	PortNumber   int `json:"port"`
 }
 
 // NewClient returns a Client configured by the config file found at configPath or an error if encountered.