chteufleur
/
go-xmpp4steam
1
1
Fork 1
Code Issues 2 Pull Requests Releases 3 Wiki Activity

Fix govet issues.

This commit is contained in:
Chteufleur 2016-11-01 07:52:47 +01:00
parent 1d5fce9b06
commit 17e46aba5e
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
database/database.go
View File

@ -36,13 +36,13 @@ func Init() {
logger.Info.Printf("Init database (file %s)", DatabaseFile) logger.Info.Printf("Init database (file %s)", DatabaseFile)
d, err := sql.Open("sqlite3", DatabaseFile) d, err := sql.Open("sqlite3", DatabaseFile)
if err != nil { if err != nil {
logger.Error.Printf("Error on openning database", err) logger.Error.Printf("Error on openning database : %v", err)
} }
db = d db = d
_, err = db.Exec(createDatabaseStmt) _, err = db.Exec(createDatabaseStmt)
if err != nil { if err != nil {
logger.Error.Printf("Failed to create table", err) logger.Error.Printf("Failed to create table : %v", err)
} }
} }
@ -60,7 +60,7 @@ func (newLine *DatabaseLine) AddLine() bool {
stmt, err := db.Prepare(insertDatabaseStmt) stmt, err := db.Prepare(insertDatabaseStmt)
if err != nil { if err != nil {
logger.Error.Printf("Error on insert jid %s", newLine.Jid, err) logger.Error.Printf("Error on insert jid %s : %v", newLine.Jid, err)
return false return false
} }
defer stmt.Close() defer stmt.Close()
@ -70,7 +70,7 @@ func (newLine *DatabaseLine) AddLine() bool {
} }
_, err = stmt.Exec(newLine.Jid, newLine.SteamLogin, newLine.SteamPwd, debug) _, err = stmt.Exec(newLine.Jid, newLine.SteamLogin, newLine.SteamPwd, debug)
if err != nil { if err != nil {
logger.Error.Printf("Error on creating SQL statement", err) logger.Error.Printf("Error on creating SQL statement : %v", err)
return false return false
} }
@ -81,7 +81,7 @@ func (newLine *DatabaseLine) UpdateLine() bool {
logger.Info.Printf("Update line %s", newLine.Jid) logger.Info.Printf("Update line %s", newLine.Jid)
stmt, err := db.Prepare(updateDatabaseStmt) stmt, err := db.Prepare(updateDatabaseStmt)
if err != nil { if err != nil {
logger.Error.Printf("Error on update ", err) logger.Error.Printf("Error on update : %v", err)
return false return false
} }
defer stmt.Close() defer stmt.Close()
@ -95,7 +95,7 @@ func (newLine *DatabaseLine) UpdateLine() bool {
} }
_, err = stmt.Exec(newLine.SteamLogin, newLine.SteamPwd, debug, newLine.Jid) _, err = stmt.Exec(newLine.SteamLogin, newLine.SteamPwd, debug, newLine.Jid)
if err != nil { if err != nil {
logger.Error.Printf("Error on updating SQL statement", err) logger.Error.Printf("Error on updating SQL statement : %v", err)
return false return false
} }
@ -123,19 +123,19 @@ func RemoveLine(jid string) bool {
logger.Info.Printf("Remove line %s", jid) logger.Info.Printf("Remove line %s", jid)
stmt, err := db.Prepare(deleteDatabaseStmt) stmt, err := db.Prepare(deleteDatabaseStmt)
if err != nil { if err != nil {
logger.Error.Printf("Error on delete jid %s", jid, err) logger.Error.Printf("Error on delete jid %s : %v", jid, err)
return false return false
} }
defer stmt.Close() defer stmt.Close()
res, err := stmt.Exec(jid) res, err := stmt.Exec(jid)
if err != nil { if err != nil {
logger.Error.Printf("Error on delete SQL statement", err) logger.Error.Printf("Error on delete SQL statement : %v", err)
return false return false
} }
affect, err := res.RowsAffected() affect, err := res.RowsAffected()
if err != nil { if err != nil {
logger.Error.Printf("Error on delete SQL statement", err) logger.Error.Printf("Error on delete SQL statement : %v", err)
return false return false
} }
if affect == 0 { if affect == 0 {
@ -163,14 +163,14 @@ func getLine(jid string) *DatabaseLine {
stmt, err := db.Prepare(selectDatabaseStmt) stmt, err := db.Prepare(selectDatabaseStmt)
if err != nil { if err != nil {
logger.Error.Printf("Error on select line", err) logger.Error.Printf("Error on select line : %v", err)
return nil return nil
} }
defer stmt.Close() defer stmt.Close()
debug := 0 debug := 0
err = stmt.QueryRow(jid).Scan(&ret.Jid, &ret.SteamLogin, &ret.SteamPwd, &debug) err = stmt.QueryRow(jid).Scan(&ret.Jid, &ret.SteamLogin, &ret.SteamPwd, &debug)
if err != nil { if err != nil {
logger.Error.Printf("Error on select scan", err) logger.Error.Printf("Error on select scan : %v", err)
return nil return nil
} }
if debug == 1 { if debug == 1 {
@ -188,7 +188,7 @@ func GetAllLines() []DatabaseLine {
rows, err := db.Query(selectAllDatabaseStmt) rows, err := db.Query(selectAllDatabaseStmt)
if err != nil { if err != nil {
logger.Error.Printf("Error on select query", err) logger.Error.Printf("Error on select query : %v", err)
} }
defer rows.Close() defer rows.Close()
for rows.Next() { for rows.Next() {

8
gateway/steam.go
View File

@ -66,12 +66,12 @@ func (g *GatewayInfo) mainSteam() {
g.SendXmppMessage(XmppJidComponent, "", "Connected on Steam network") g.SendXmppMessage(XmppJidComponent, "", "Connected on Steam network")
case *steam.LoggedOffEvent: case *steam.LoggedOffEvent:
logger.Error.Printf("[%s] LoggedOffEvent: ", g.XMPP_JID_Client, e) logger.Error.Printf("[%s] LoggedOffEvent: %v", g.XMPP_JID_Client, e)
g.SendXmppMessage(XmppJidComponent, "", fmt.Sprintf("Disconnected of Steam network (%v)", e)) g.SendXmppMessage(XmppJidComponent, "", fmt.Sprintf("Disconnected of Steam network (%v)", e))
g.SteamConnecting = false g.SteamConnecting = false
case steam.FatalErrorEvent: case steam.FatalErrorEvent:
logger.Error.Printf("[%s] FatalError: ", g.XMPP_JID_Client, e) logger.Error.Printf("[%s] FatalError: %v", g.XMPP_JID_Client, e)
g.SendXmppMessage(XmppJidComponent, "", fmt.Sprintf("Steam Fatal Error : %v", e)) g.SendXmppMessage(XmppJidComponent, "", fmt.Sprintf("Steam Fatal Error : %v", e))
g.DisconnectAllSteamFriend() g.DisconnectAllSteamFriend()
g.SteamConnecting = false g.SteamConnecting = false
@ -83,11 +83,11 @@ func (g *GatewayInfo) mainSteam() {
g.SteamConnecting = false g.SteamConnecting = false
case error: case error:
logger.Error.Printf("[%s] ", g.XMPP_JID_Client, e) logger.Error.Printf("[%s] error: %v", g.XMPP_JID_Client, e)
g.SendXmppMessage(XmppJidComponent, "", "Steam Error : "+e.Error()) g.SendXmppMessage(XmppJidComponent, "", "Steam Error : "+e.Error())
case *steam.LogOnFailedEvent: case *steam.LogOnFailedEvent:
logger.Error.Printf("[%s] Login failed", g.XMPP_JID_Client, e) logger.Error.Printf("[%s] Login failed: %v", g.XMPP_JID_Client, e)
g.SendXmppMessage(XmppJidComponent, "", fmt.Sprintf("Login failed : %v", e.Result)) g.SendXmppMessage(XmppJidComponent, "", fmt.Sprintf("Login failed : %v", e.Result))
g.SteamConnecting = false g.SteamConnecting = false