couple of changes

Author: etowett

.gitignore

@@ -0,0 +1,3 @@
+*.pid
+*.log
+*.log.*

Dockerfile

@@ -0,0 +1,17 @@
+FROM golang:1.7.3
+# FROM golang:1.7.3-onbuild
+
+# Install beego and the bee dev tool
+RUN go get github.com/go-sql-driver/mysql
+
+# Expose the application on port 4147
+EXPOSE 4147
+
+# Set the entry point of the container to the bee command that runs the
+# application and watches for changes
+# CMD ["bee", "run"]
+
+
+# ########
+# docker build -t callbacks .
+# docker run -it --rm --name gcllbcks -p 4147:4147 -v /home/ekt/go/src/gcllbcks:/go/src/gcllbcks -w /go/src/gcllbcks callbacks

callbacks.service

@@ -0,0 +1,12 @@
+[Unit]
+Description=callbacks Service
+
+[Service]
+PIDFile=/tmp/gowiki.pid-4040
+User=root
+Group=root
+WorkingDirectory=/var/www
+ExecStart=/bin/bash -c '/apps/gcallbks'
+
+[Install]
+WantedBy=multi-user.target

common/logger.go

@@ -0,0 +1,7 @@
+package common
+
+import (
+	"log"
+)
+
+var Logger *log.Logger

logs/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

main.go

@@ -1,19 +1,22 @@
-
 package main
 
 import (
+	"database/sql"
+	"gcllbcks/common"
+	"gcllbcks/mylib"
 	"log"
 	"net/http"
-	"database/sql"
+	"os"
+
 	_ "github.com/go-sql-driver/mysql"
-	"gcllbcks/mylib"
-	"gcllbcks/common"
 )
 
 var err error
 
 func main() {
 
+	// DB Connecton
+
 	common.DbCon, err = sql.Open("mysql", "kip:kip@db@/smsleopard")
 	if err != nil {
 		panic(err.Error())
@@ -26,9 +29,22 @@ func main() {
 		panic(err.Error())
 	}
 
+	// Logger set up
+
+	logFile, openErr1 := os.OpenFile("logs/callbacks.log", os.O_CREATE|os.O_RDWR|os.O_APPEND, 0666)
+
+	if openErr1 != nil {
+		log.Println("Uh oh! Could not open log file.", openErr1)
+	}
+
+	defer logFile.Close()
+
+	common.Logger = log.New(logFile, "", log.Lshortfile|log.Ldate|log.Ltime)
+
+	// Route set up
+
 	http.HandleFunc("/dlrs", mylib.DlrPage)
 	http.HandleFunc("/inbox", mylib.InboxPage)
 	http.HandleFunc("/optout", mylib.OptoutPage)
 	log.Fatal(http.ListenAndServe(":4147", nil))
-
 }

mylib/dlrs.go

@@ -2,38 +2,40 @@ package mylib
 
 import (
 	"fmt"
-	"log"
 	"net/http"
 
 	"gcllbcks/common"
 )
 
-
 func DlrPage(w http.ResponseWriter, r *http.Request) {
+	logger := common.Logger
 	if r.Method != "POST" {
 		fmt.Fprintf(w, "Method Not Allowed")
 		return
 	}
 
-    aid := r.FormValue("id")
-    status := r.FormValue("status")
-    reason := r.FormValue("reason")
+	aid := r.FormValue("id")
+	status := r.FormValue("status")
+	reason := r.FormValue("reason")
+
+	request := map[string]string{
+		"aid": aid, "status": status, "reason": reason,
+	}
 
-    request := map[string]string {
-        "aid": aid, "status": status, "reason": reason,
-    }
+	go saveDlr(request)
 
-    go saveDlr(request)
+	logger.Println("Dlr Request: ", request)
 
 	fmt.Fprintf(w, "Dlr Received")
 	return
 }
 
 func saveDlr(req map[string]string) {
-    db := common.DbCon
+	logger := common.Logger
+	db := common.DbCon
 	stmt, err1 := db.Prepare("update bsms_smsrecipient set status=?, reason=? where api_id=?")
 	if err1 != nil {
-		log.Fatal("Couldn't prepare for dlr update", err1)
+		logger.Fatal("Couldn't prepare for dlr update", err1)
 		return
 	}
 
@@ -42,8 +44,9 @@ func saveDlr(req map[string]string) {
 	_, err := stmt.Exec(req["status"], req["reason"], req["aid"])
 
 	if err != nil {
-		log.Fatal("Cannot run update dlr", err)
+		logger.Println("Cannot run update dlr", err)
 		return
 	}
-    return
+	logger.Println("Dlr saved: ", req["aid"])
+	return
 }

mylib/inbox.go

@@ -2,113 +2,116 @@ package mylib
 
 import (
 	"fmt"
-	"log"
 	"net/http"
+	"strconv"
 	"strings"
-    "strconv"
 	"time"
 
 	"database/sql"
 	"gcllbcks/common"
 )
 
 type Code struct {
-    Id string
-    Type string
-    UserId sql.NullInt64
+	Id     string
+	Type   string
+	UserId sql.NullInt64
 }
 
 func InboxPage(w http.ResponseWriter, r *http.Request) {
+	logger := common.Logger
 	if r.Method != "POST" {
 		fmt.Fprintf(w, "Method Not Allowed")
 		return
 	}
 
-    from := r.FormValue("from")
-    to := r.FormValue("to")
-    text := r.FormValue("text")
-    date := r.FormValue("date")
-    id := r.FormValue("id")
+	from := r.FormValue("from")
+	to := r.FormValue("to")
+	text := r.FormValue("text")
+	date := r.FormValue("date")
+	id := r.FormValue("id")
 
-    request := map[string]string {
-        "from": from, "code": to, "txt": text,
-        "date": date, "aid": id,
-    }
+	request := map[string]string{
+		"from": from, "code": to, "txt": text,
+		"date": date, "aid": id,
+	}
 
-    fmt.Println("Inbox request: ", request)
+	logger.Println("Inbox request: ", request)
 
-    go saveInbox(request)
+	go saveInbox(request)
 
 	fmt.Fprintf(w, "Inbox Received")
 	return
 }
 
 func saveInbox(req map[string]string) {
-    dets := getCodeDets(req["code"])
-
-    if (Code{}) == dets {
-        fmt.Println("Inbox no code:", req)
-    } else {
-        req["code_id"] = dets.Id
-        if dets.Type == "DEDICATED" {
-            if dets.UserId.Valid {
-                req["user_id"] = strconv.Itoa(int(dets.UserId.Int64))
-                go saveInboxData(req)
-            } else {
-                fmt.Println("Dedicated has no user:", req)
-            }
-        } else if dets.Type == "SHARED" {
-            go checkShared(req)
-        }
-    }
-    return
+	logger := common.Logger
+	dets := getCodeDets(req["code"])
+
+	if (Code{}) == dets {
+		logger.Println("Inbox no code:", req)
+	} else {
+		req["code_id"] = dets.Id
+		if dets.Type == "DEDICATED" {
+			if dets.UserId.Valid {
+				req["user_id"] = strconv.Itoa(int(dets.UserId.Int64))
+				go saveInboxData(req)
+			} else {
+				logger.Println("Dedicated has no user:", req)
+			}
+		} else if dets.Type == "SHARED" {
+			go checkShared(req)
+		}
+	}
+	return
 }
 
 func getCodeDets(code string) Code {
-    db := common.DbCon
-    row := db.QueryRow("select id, code_type, user_id from callbacks_code where code=?", code)
-    // cd := new(Code)
-    cd := Code{}
-    // err := row.Scan(&cd.Id, &cd.Type, &cd.UserId)
-    row.Scan(&cd.Id, &cd.Type, &cd.UserId)
+	db := common.DbCon
+	row := db.QueryRow("select id, code_type, user_id from callbacks_code where code=?", code)
+	// cd := new(Code)
+	cd := Code{}
+	// err := row.Scan(&cd.Id, &cd.Type, &cd.UserId)
+	row.Scan(&cd.Id, &cd.Type, &cd.UserId)
 	// if err != nil {
-	//    log.Fatal("Couldn't scan select code", err)
+	//    logger.Println("Couldn't scan select code", err)
 	//    return cd
 	// }
-    return cd
+	return cd
 }
 
 func checkShared(req map[string]string) {
-    db := common.DbCon
-    cd := req["code_id"]
-    kw := strings.ToLower(strings.Fields(req["txt"])[0])
-    row := db.QueryRow("select user_id from callbacks_shared where code_id=? and keyword=?", cd, kw)
+	logger := common.Logger
+	db := common.DbCon
+	cd := req["code_id"]
+	kw := strings.ToLower(strings.Fields(req["txt"])[0])
+	row := db.QueryRow("select user_id from callbacks_shared where code_id=? and keyword=?", cd, kw)
 
-    var uid sql.NullInt64
-    // err := row.Scan(&uid)
-    row.Scan(&uid)
+	var uid sql.NullInt64
+	// err := row.Scan(&uid)
+	row.Scan(&uid)
 
-    // fmt.Println("Uid: ", uid)
+	// logger.Println("Uid: ", uid)
 
 	// if err != nil {
-    //     log.Fatal("Couldn't scan select shared: ", err)
+	//     logger.Println("Couldn't scan select shared: ", err)
 	//     return
 	// }
 
-    if uid.Valid {
-        req["user_id"] = strconv.Itoa(int(uid.Int64))
-        go saveInboxData(req)
-    } else {
-        fmt.Println("Shared has no user: ", req)
-    }
-    return
+	if uid.Valid {
+		req["user_id"] = strconv.Itoa(int(uid.Int64))
+		go saveInboxData(req)
+	} else {
+		logger.Println("Shared has no user: ", req)
+	}
+	return
 }
 
 func saveInboxData(req map[string]string) {
-    db := common.DbCon
+	logger := common.Logger
+	db := common.DbCon
 	stmt, err1 := db.Prepare("insert into bsms_smsinbox(is_read, sender, short_code, api_id, message, user_id, deleted, api_date, insert_date) values (?, ?, ?, ?, ?, ?, ?, ?, ?)")
 	if err1 != nil {
-		log.Fatal("Couldn't prepare for inbox insert", err1)
+		logger.Println("Couldn't prepare for inbox insert", err1)
 		return
 	}
 
@@ -117,12 +120,11 @@ func saveInboxData(req map[string]string) {
 	_, err := stmt.Exec(0, req["from"], req["code"], req["aid"], req["txt"], req["user_id"], 0, req["date"], time.Now())
 
 	if err != nil {
-		log.Fatal("Cannot run insert Inbox", err)
+		logger.Println("Cannot run insert Inbox", err)
 		return
 	}
 
-    fmt.Println("Saved Inbox:", req)
+	logger.Println("Saved Inbox:", req)
 
-    return
+	return
 }
-

mylib/optout.go

@@ -2,38 +2,40 @@ package mylib
 
 import (
 	"fmt"
-	"log"
 	"net/http"
 	"time"
 
 	"gcllbcks/common"
 )
 
-
 func OptoutPage(w http.ResponseWriter, r *http.Request) {
+	logger := common.Logger
 	if r.Method != "POST" {
 		fmt.Fprintf(w, "Method Not Allowed")
 		return
 	}
 
-    sid := r.FormValue("senderId")
-    num := r.FormValue("phoneNumber")
+	sid := r.FormValue("senderId")
+	num := r.FormValue("phoneNumber")
+
+	request := map[string]string{
+		"sid": sid, "num": num,
+	}
 
-    request := map[string]string {
-        "sid": sid, "num": num,
-    }
+	logger.Println("Optout request: ", request)
 
-    go saveOptout(request)
+	go saveOptout(request)
 
 	fmt.Fprintf(w, "Optout Received")
 	return
 }
 
 func saveOptout(req map[string]string) {
-    db := common.DbCon
+	logger := common.Logger
+	db := common.DbCon
 	stmt, err1 := db.Prepare("insert into callbacks_optout (senderid, phone, time_added) values (?, ?, ?)")
 	if err1 != nil {
-		log.Fatal("Couldn't prepare for optout insert", err1)
+		logger.Println("Couldn't prepare for optout insert", err1)
 		return
 	}
 
@@ -42,8 +44,11 @@ func saveOptout(req map[string]string) {
 	_, err := stmt.Exec(req["sid"], req["num"], time.Now())
 
 	if err != nil {
-		log.Fatal("Cannot run insert optout", err)
+		logger.Println("Cannot run insert optout", err)
 		return
 	}
-    return
+
+	logger.Println("Saved opt out: ", req)
+
+	return
 }