diff --git a/main.go b/main.go index 5e72bb0..55668e1 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,7 @@ package main import ( - "database/sql" + // "database/sql" "encoding/json" "encoding/xml" "fmt" @@ -65,15 +65,13 @@ type App struct { dispPort *serial.Port lockConn net.Conn lockserver lockserver.LockServer - db *sql.DB } -func newApp(dispPort *serial.Port, lockConn net.Conn, config configRec, db *sql.DB) *App { +func newApp(dispPort *serial.Port, lockConn net.Conn, config configRec) *App { return &App{ dispPort: dispPort, lockConn: lockConn, lockserver: lockserver.NewLockServer(config.LockType, config.EncoderAddress, fatalError), - db: db, } } @@ -120,11 +118,11 @@ func main() { defer lockConn.Close() log.Infof("Connected to lock server at %s", config.LockserverUrl) - db, err := payment.InitMSSQL(config.dbport, config.dbname, config.dbuser, config.dbpassword) - if err != nil { - fatalError(fmt.Errorf("DB init failed: %v", err)) - } - defer db.Close() + // db, err := payment.InitMSSQL(config.dbport, config.dbname, config.dbuser, config.dbpassword) + // if err != nil { + // fatalError(fmt.Errorf("DB init failed: %v", err)) + // } + // defer db.Close() startClient := func() (*exec.Cmd, error) { cmd := exec.Command("./ChipDNAClient/ChipDnaClient.exe") @@ -182,7 +180,7 @@ func main() { }() // Create App and wire routes - app := newApp(dispHandle, lockConn, config, db) + app := newApp(dispHandle, lockConn, config) mux := http.NewServeMux() setUpRoutes(app, mux)