diff --git a/api/handlers.go b/api/handlers.go index af5efb380..c56ddffb8 100644 --- a/api/handlers.go +++ b/api/handlers.go @@ -54,7 +54,7 @@ func branchesHandler(w http.ResponseWriter, r *http.Request) { // Return the list as JSON jsonList, err := json.MarshalIndent(brList, "", " ") if err != nil { - errMsg := fmt.Sprintf("Error when JSON marshalling the branch list: %v\n", err) + errMsg := fmt.Sprintf("Error when JSON marshalling the branch list: %v", err) log.Print(errMsg) jsonErr(w, errMsg, http.StatusBadRequest) return @@ -205,7 +205,7 @@ func columnsHandler(w http.ResponseWriter, r *http.Request) { // Return the results jsonData, err := json.MarshalIndent(jsonCols, "", " ") if err != nil { - log.Printf("Error when JSON marshalling returned data in columnsHandler(): %v\n", err) + log.Printf("Error when JSON marshalling returned data in columnsHandler(): %v", err) jsonErr(w, err.Error(), http.StatusInternalServerError) return } @@ -248,7 +248,7 @@ func commitsHandler(w http.ResponseWriter, r *http.Request) { // Return the tags as JSON jsonData, err := json.MarshalIndent(commits, "", " ") if err != nil { - log.Printf("Error when JSON marshalling returned data in commitsHandler(): %v\n", err) + log.Printf("Error when JSON marshalling returned data in commitsHandler(): %v", err) jsonErr(w, err.Error(), http.StatusInternalServerError) return } @@ -306,7 +306,7 @@ func databasesHandler(w http.ResponseWriter, r *http.Request) { // Return the results jsonData, err := json.MarshalIndent(list, "", " ") if err != nil { - log.Printf("Error when JSON marshalling returned data in databasesHandler(): %v\n", err) + log.Printf("Error when JSON marshalling returned data in databasesHandler(): %v", err) jsonErr(w, err.Error(), http.StatusInternalServerError) return } @@ -571,7 +571,7 @@ func diffHandler(w http.ResponseWriter, r *http.Request) { // Return the results jsonData, err := json.MarshalIndent(diffs, "", " ") if err != nil { - log.Printf("Error when JSON marshalling returned data in diffHandler(): %v\n", err) + log.Printf("Error when JSON marshalling returned data in diffHandler(): %v", err) jsonErr(w, err.Error(), http.StatusInternalServerError) return } @@ -687,7 +687,7 @@ func executeHandler(w http.ResponseWriter, r *http.Request) { z := com.ExecuteResponseContainer{RowsChanged: rowsChanged, Status: "OK"} jsonData, err := json.MarshalIndent(z, "", " ") if err != nil { - log.Printf("Error when JSON marshalling returned data in executeHandler(): %v\n", err) + log.Printf("Error when JSON marshalling returned data in executeHandler(): %v", err) jsonErr(w, err.Error(), http.StatusInternalServerError) return } @@ -810,7 +810,7 @@ func indexesHandler(w http.ResponseWriter, r *http.Request) { // Return the results jsonData, err := json.MarshalIndent(indexes, "", " ") if err != nil { - log.Printf("Error when JSON marshalling returned data in indexesHandler(): %v\n", err) + log.Printf("Error when JSON marshalling returned data in indexesHandler(): %v", err) jsonErr(w, err.Error(), http.StatusInternalServerError) return } @@ -853,7 +853,7 @@ func metadataHandler(w http.ResponseWriter, r *http.Request) { // Return the list as JSON jsonList, err := json.MarshalIndent(meta, "", " ") if err != nil { - errMsg := fmt.Sprintf("Error when JSON marshalling the metadata: %v\n", err) + errMsg := fmt.Sprintf("Error when JSON marshalling the metadata: %v", err) log.Print(errMsg) jsonErr(w, errMsg, http.StatusBadRequest) return @@ -933,7 +933,7 @@ func queryHandler(w http.ResponseWriter, r *http.Request) { // Send the query to the appropriate backend live node data, err = com.LiveQueryDB(com.AmqpChan, liveNode, loggedInUser, dbOwner, dbName, query) if err != nil { - log.Println(err) // FIXME: Debug output while developing + log.Println(err) jsonErr(w, err.Error(), http.StatusInternalServerError) return } @@ -942,7 +942,7 @@ func queryHandler(w http.ResponseWriter, r *http.Request) { // Return the results jsonData, err := json.MarshalIndent(data.Records, "", " ") if err != nil { - jsonErr(w, fmt.Sprintf("Error when JSON marshalling the returned data: %v\n", err), + jsonErr(w, fmt.Sprintf("Error when JSON marshalling the returned data: %v", err), http.StatusBadRequest) return } @@ -985,7 +985,7 @@ func releasesHandler(w http.ResponseWriter, r *http.Request) { // Return the list as JSON jsonData, err := json.MarshalIndent(rels, "", " ") if err != nil { - log.Printf("Error when JSON marshalling returned data in releasesHandler(): %v\n", err) + log.Printf("Error when JSON marshalling returned data in releasesHandler(): %v", err) jsonErr(w, err.Error(), http.StatusInternalServerError) return } @@ -1092,7 +1092,7 @@ func tablesHandler(w http.ResponseWriter, r *http.Request) { sort.Strings(tables) jsonData, err := json.MarshalIndent(tables, "", " ") if err != nil { - log.Printf("Error when JSON marshalling returned data in tablesHandler(): %v\n", err) + log.Printf("Error when JSON marshalling returned data in tablesHandler(): %v", err) jsonErr(w, err.Error(), http.StatusInternalServerError) return } @@ -1135,7 +1135,7 @@ func tagsHandler(w http.ResponseWriter, r *http.Request) { // Return the tags as JSON jsonData, err := json.MarshalIndent(tags, "", " ") if err != nil { - log.Printf("Error when JSON marshalling returned data in tagsHandler(): %v\n", err) + log.Printf("Error when JSON marshalling returned data in tagsHandler(): %v", err) jsonErr(w, err.Error(), http.StatusInternalServerError) return } @@ -1199,11 +1199,10 @@ func uploadHandler(w http.ResponseWriter, r *http.Request) { // Check whether the uploaded database is too large if !oversizeAllowed { if r.ContentLength > (com.MaxDatabaseSize * 1024 * 1024) { - jsonErr(w, - fmt.Sprintf("Database is too large. Maximum database upload size is %d MB, yours is %d MB", - com.MaxDatabaseSize, r.ContentLength/1024/1024), http.StatusBadRequest) - log.Println(fmt.Sprintf("'%s' attempted to upload an oversized database %d MB in size. Limit is %d MB\n", - loggedInUser, r.ContentLength/1024/1024, com.MaxDatabaseSize)) + jsonErr(w, fmt.Sprintf("Database is too large. Maximum database upload size is %d MB, yours is %d MB", + com.MaxDatabaseSize, r.ContentLength/1024/1024), http.StatusBadRequest) + log.Printf("'%s' attempted to upload an oversized database %d MB in size. Limit is %d MB", + loggedInUser, r.ContentLength/1024/1024, com.MaxDatabaseSize) return } } @@ -1344,7 +1343,7 @@ func uploadHandler(w http.ResponseWriter, r *http.Request) { z := com.UploadResponseContainer{CommitID: newCommit, URL: newURL} jsonData, err := json.MarshalIndent(z, "", " ") if err != nil { - log.Printf("Error when JSON marshalling returned data in uploadHandler(): %v\n", err) + log.Printf("Error when JSON marshalling returned data in uploadHandler(): %v", err) jsonErr(w, err.Error(), http.StatusInternalServerError) return } @@ -1426,7 +1425,7 @@ func viewsHandler(w http.ResponseWriter, r *http.Request) { sort.Strings(views) jsonData, err := json.MarshalIndent(views, "", " ") if err != nil { - log.Printf("Error when JSON marshalling returned data in viewsHandler(): %v\n", err) + log.Printf("Error when JSON marshalling returned data in viewsHandler(): %v", err) jsonErr(w, err.Error(), http.StatusInternalServerError) return } @@ -1453,7 +1452,7 @@ func webpageHandler(w http.ResponseWriter, r *http.Request) { z.WebPage = "https://" + com.Conf.Web.ServerName + "/" + dbOwner + "/" + dbName jsonData, err := json.MarshalIndent(z, "", " ") if err != nil { - log.Printf("Error when JSON marshalling returned data in webpageHandler(): %v\n", err) + log.Printf("Error when JSON marshalling returned data in webpageHandler(): %v", err) jsonErr(w, err.Error(), http.StatusInternalServerError) return } diff --git a/api/main.go b/api/main.go index 2a3caf9a9..11c305669 100644 --- a/api/main.go +++ b/api/main.go @@ -53,10 +53,10 @@ func main() { // Open the request log for writing reqLog, err = os.OpenFile(com.Conf.Api.RequestLog, os.O_CREATE|os.O_APPEND|os.O_WRONLY|os.O_SYNC, 0750) if err != nil { - log.Fatalf("Error when opening request log: %s\n", err) + log.Fatalf("Error when opening request log: %s", err) } defer reqLog.Close() - log.Printf("Request log opened: %s\n", com.Conf.Api.RequestLog) + log.Printf("Request log opened: %s", com.Conf.Api.RequestLog) // Parse our template files tmpl = template.Must(template.New("templates").Delims("[[", "]]").ParseGlob( @@ -103,12 +103,12 @@ func main() { ourCAPool = x509.NewCertPool() certFile, err := os.ReadFile(com.Conf.DB4S.CAChain) if err != nil { - fmt.Printf("Error opening Certificate Authority chain file: %v\n", err) + log.Printf("Error opening Certificate Authority chain file: %v", err) return } ok := ourCAPool.AppendCertsFromPEM(certFile) if !ok { - fmt.Println("Error appending certificate file") + log.Println("Error appending certificate file") return } @@ -159,7 +159,7 @@ func main() { server = fmt.Sprintf("https://%s", com.Conf.Api.ServerName) // Start API server - log.Printf("API server starting on %s\n", server) + log.Printf("API server starting on %s", server) err = srv.ListenAndServeTLS(com.Conf.Api.Certificate, com.Conf.Api.CertificateKey) // Shut down nicely @@ -283,7 +283,7 @@ func collectInfoAndOpen(w http.ResponseWriter, r *http.Request) (sdb *sqlite.Con return } if err = sdb.EnableExtendedResultCodes(true); err != nil { - log.Printf("Couldn't enable extended result codes in collectInfoAndOpen(): %v\n", err.Error()) + log.Printf("Couldn't enable extended result codes in collectInfoAndOpen(): %v", err.Error()) httpStatus = http.StatusInternalServerError return } @@ -320,7 +320,7 @@ func extractUserFromClientCert(w http.ResponseWriter, r *http.Request) (userAcc // Verify the running server matches the one in the certificate db4sServer := com.Conf.DB4S.Server if certServer != db4sServer { - err = fmt.Errorf("Server name in certificate '%s' doesn't match DB4S server '%s'\n", certServer, + err = fmt.Errorf("Server name in certificate '%s' doesn't match DB4S server '%s'", certServer, db4sServer) return } @@ -348,7 +348,7 @@ func jsonErr(w http.ResponseWriter, msg string, statusCode int) { } jsonData, err := json.MarshalIndent(je, "", " ") if err != nil { - errMsg := fmt.Sprintf("A 2nd error occurred when JSON marshalling an error structure: %v\n", err) + errMsg := fmt.Sprintf("A 2nd error occurred when JSON marshalling an error structure: %v", err) log.Print(errMsg) http.Error(w, errMsg, http.StatusInternalServerError) fmt.Fprintf(w, `{"error":"An error occurred when marshalling JSON inside jsonErr()"}`) diff --git a/common/cert.go b/common/cert.go index 91e088614..728603d09 100644 --- a/common/cert.go +++ b/common/cert.go @@ -38,55 +38,55 @@ func GenerateClientCert(userName string) (_ []byte, err error) { serialNumLimit := new(big.Int).Lsh(big.NewInt(1), 128) newCert.SerialNumber, err = rand.Int(rand.Reader, serialNumLimit) if err != nil { - log.Printf("%s: Error when generating serial number: %v\n", pageName, err) + log.Printf("%s: Error when generating serial number: %v", pageName, err) return nil, err } // Load the certificate used for signing (the intermediate certificate) certFile, err := os.ReadFile(Conf.Sign.IntermediateCert) if err != nil { - log.Printf("%s: Error opening intermediate certificate file: %v\n", pageName, err) + log.Printf("%s: Error opening intermediate certificate file: %v", pageName, err) return } certPEM, _ := pem.Decode(certFile) if certPEM == nil { - log.Printf("%s: Error when PEM decoding the intermediate certificate file\n", pageName) + log.Printf("%s: Error when PEM decoding the intermediate certificate file", pageName) return } intCert, err := x509.ParseCertificate(certPEM.Bytes) if err != nil { - log.Printf("%s: Error when parsing decoded intermediate certificate data: %v\n", pageName, err) + log.Printf("%s: Error when parsing decoded intermediate certificate data: %v", pageName, err) return } // Load the private key for the intermediate certificate intKeyFile, err := os.ReadFile(Conf.Sign.IntermediateKey) if err != nil { - log.Printf("%s: Error opening intermediate certificate key: %v\n", pageName, err) + log.Printf("%s: Error opening intermediate certificate key: %v", pageName, err) return } intKeyPEM, _ := pem.Decode(intKeyFile) if certPEM == nil { - log.Printf("%s: Error when PEM decoding the intermediate key file\n", pageName) + log.Printf("%s: Error when PEM decoding the intermediate key file", pageName) return } intKey, err := x509.ParsePKCS1PrivateKey(intKeyPEM.Bytes) if err != nil { - log.Printf("%s: Error when parsing intermediate certificate key: %v\n", pageName, err) + log.Printf("%s: Error when parsing intermediate certificate key: %v", pageName, err) return } // Generate a public key to sign the new certificate with clientKey, err := rsa.GenerateKey(rand.Reader, 2048) if err != nil { - log.Printf("%s: Failed to public key for signing: %v\n", pageName, err) + log.Printf("%s: Failed to public key for signing: %v", pageName, err) return } // Generate the new certificate clientCert, err := x509.CreateCertificate(rand.Reader, &newCert, intCert, &clientKey.PublicKey, intKey) if err != nil { - log.Printf("%s: Failed to create certificate: %v\n", pageName, err) + log.Printf("%s: Failed to create certificate: %v", pageName, err) return } @@ -94,7 +94,7 @@ func GenerateClientCert(userName string) (_ []byte, err error) { buf := &bytes.Buffer{} err = pem.Encode(buf, &pem.Block{Type: "CERTIFICATE", Bytes: clientCert}) if err != nil { - log.Printf("%s: Failed to PEM encode certificate: %v\n", pageName, err) + log.Printf("%s: Failed to PEM encode certificate: %v", pageName, err) return } @@ -102,14 +102,14 @@ func GenerateClientCert(userName string) (_ []byte, err error) { buf2 := &bytes.Buffer{} err = pem.Encode(buf2, &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(clientKey)}) if err != nil { - log.Printf("%s: Failed to PEM encode private key: %v\n", pageName, err) + log.Printf("%s: Failed to PEM encode private key: %v", pageName, err) return } // Concatenate the newly generated certificate and its key _, err = buf.ReadFrom(buf2) if err != nil { - log.Printf("%s: Failed to concatenate the PEM blocks: %v\n", pageName, err) + log.Printf("%s: Failed to concatenate the PEM blocks: %v", pageName, err) return } diff --git a/common/diff.go b/common/diff.go index 971cb85df..f58ceccce 100644 --- a/common/diff.go +++ b/common/diff.go @@ -134,7 +134,7 @@ func dbDiff(dbA string, dbB string, merge MergeStrategy, includeData bool) (Diff } defer sdb.Close() if err = sdb.EnableExtendedResultCodes(true); err != nil { - log.Printf("Couldn't enable extended result codes in dbDiff(): %v\n", err.Error()) + log.Printf("Couldn't enable extended result codes in dbDiff(): %v", err.Error()) return Diffs{}, err } @@ -152,7 +152,7 @@ func dbDiff(dbA string, dbB string, merge MergeStrategy, includeData bool) (Diff "SELECT name, type FROM aux.sqlite_master WHERE name NOT LIKE 'sqlite_%' AND (type != 'table' OR (type = 'table' AND sql NOT LIKE 'CREATE VIRTUAL%%'))\n" + " ORDER BY name") if err != nil { - log.Printf("Error when preparing statement for object list in dbDiff(): %s\n", err) + log.Printf("Error when preparing statement for object list in dbDiff(): %s", err) return Diffs{}, err } defer stmt.Finalize() @@ -169,7 +169,7 @@ func dbDiff(dbA string, dbB string, merge MergeStrategy, includeData bool) (Diff return nil }) if err != nil { - log.Printf("Error when diffing single object in dbDiff: %s\n", err) + log.Printf("Error when diffing single object in dbDiff: %s", err) return Diffs{}, err } @@ -319,7 +319,7 @@ func dataDiffForAllTableRows(sdb *sqlite.Conn, schemaName string, tableName stri // Retrieve data and add it to the data diff object _, _, data, err := SQLiteRunQuery(sdb, QuerySourceInternal, query, false, false) if err != nil { - log.Printf("Error getting rows in dataDiffForAllTableRows(): %s\n", err) + log.Printf("Error getting rows in dataDiffForAllTableRows(): %s", err) return nil, err } for _, row := range data.Records { @@ -504,7 +504,7 @@ func dataDiffForModifiedTableRows(sdb *sqlite.Conn, tableName string, merge Merg // Retrieve data and generate a new DataDiff object for each row _, _, data, err := SQLiteRunQuery(sdb, QuerySourceInternal, query, false, false) if err != nil { - log.Printf("Error getting rows in dataDiffForModifiedTableRows(): %s\n", err) + log.Printf("Error getting rows in dataDiffForModifiedTableRows(): %s", err) return nil, err } for _, row := range data.Records { diff --git a/common/live.go b/common/live.go index 98f29eadb..006ea1283 100644 --- a/common/live.go +++ b/common/live.go @@ -55,7 +55,7 @@ func ConnectMQ() (channel *amqp.Channel, err error) { if err != nil { return } - log.Printf("%s connected to AMQP server using mutual TLS (mTLS): %v:%d\n", Conf.Live.Nodename, Conf.MQ.Server, Conf.MQ.Port) + log.Printf("%s connected to AMQP server using mutual TLS (mTLS): %v:%d", Conf.Live.Nodename, Conf.MQ.Server, Conf.MQ.Port) } else { // Fallback to just verifying the server certs for TLS. This is needed by the DB4S end point, as it // uses certs from our own CA, so mTLS won't easily work with it. @@ -63,7 +63,7 @@ func ConnectMQ() (channel *amqp.Channel, err error) { if err != nil { return } - log.Printf("%s connected to AMQP server with server-only TLS: %v:%d\n", Conf.Live.Nodename, Conf.MQ.Server, Conf.MQ.Port) + log.Printf("%s connected to AMQP server with server-only TLS: %v:%d", Conf.Live.Nodename, Conf.MQ.Server, Conf.MQ.Port) } } else { // Everywhere else (eg docker container) doesn't *have* to use TLS @@ -71,7 +71,7 @@ func ConnectMQ() (channel *amqp.Channel, err error) { if err != nil { return } - log.Printf("%s connected to AMQP server without encryption: %v:%d\n", Conf.Live.Nodename, Conf.MQ.Server, Conf.MQ.Port) + log.Printf("%s connected to AMQP server without encryption: %v:%d", Conf.Live.Nodename, Conf.MQ.Server, Conf.MQ.Port) } channel, err = conn.Channel() diff --git a/common/memcache.go b/common/memcache.go index fbada6d5d..bf1834d76 100644 --- a/common/memcache.go +++ b/common/memcache.go @@ -58,7 +58,7 @@ func ConnectCache() error { } // Log successful connection message for Memcached - log.Printf("Connected to Memcached: %v\n", Conf.Memcache.Server) + log.Printf("Connected to Memcached: %v", Conf.Memcache.Server) return nil } diff --git a/common/minio.go b/common/minio.go index ed80ee0b1..d30a66a86 100644 --- a/common/minio.go +++ b/common/minio.go @@ -22,11 +22,11 @@ func ConnectMinio() (err error) { // Connect to the Minio server minioClient, err = minio.New(Conf.Minio.Server, Conf.Minio.AccessKey, Conf.Minio.Secret, Conf.Minio.HTTPS) if err != nil { - return fmt.Errorf("Problem with Minio server configuration: %v\n", err) + return fmt.Errorf("Problem with Minio server configuration: %v", err) } // Log Minio server end point - log.Printf("Minio server config ok. Address: %v\n", Conf.Minio.Server) + log.Printf("Minio server config ok. Address: %v", Conf.Minio.Server) return nil } @@ -77,7 +77,7 @@ func LiveRetrieveDatabaseMinio(baseDir, dbOwner, dbName, objectID string) (dbPat return } if bytesWritten == 0 { - log.Printf("Error! 0 bytes written to the new SQLite database file: %s\n", dbPath) + log.Printf("Error! 0 bytes written to the new SQLite database file: %s", dbPath) err = errors.New("Internal server error") return } @@ -161,7 +161,7 @@ func MinioDeleteDatabase(source, dbOwner, dbName, bucket, id string) (err error) func MinioHandle(bucket, id string) (*minio.Object, error) { userDB, err := minioClient.GetObject(bucket, id, minio.GetObjectOptions{}) if err != nil { - log.Printf("Error retrieving DB from Minio: %v\n", err) + log.Printf("Error retrieving DB from Minio: %v", err) return nil, errors.New("Error retrieving database from internal storage") } return userDB, nil @@ -171,7 +171,7 @@ func MinioHandle(bucket, id string) (*minio.Object, error) { func MinioHandleClose(userDB *minio.Object) (err error) { err = userDB.Close() if err != nil { - log.Printf("Error closing object handle: %v\n", err) + log.Printf("Error closing object handle: %v", err) } return } @@ -207,16 +207,16 @@ func RetrieveDatabaseFile(bucket, id string) (newDB string, err error) { var f *os.File f, err = os.OpenFile(newDB+".new", os.O_CREATE|os.O_WRONLY, 0750) if err != nil { - log.Printf("Error creating new database file in the disk cache: %v\n", err) + log.Printf("Error creating new database file in the disk cache: %v", err) return "", errors.New("Internal server error") } bytesWritten, err := io.Copy(f, userDB) if err != nil { - log.Printf("Error writing to new database file in the disk cache : %v\n", err) + log.Printf("Error writing to new database file in the disk cache : %v", err) return "", errors.New("Internal server error") } if bytesWritten == 0 { - log.Printf("0 bytes written to the new SQLite database file: %s\n", newDB+".new") + log.Printf("0 bytes written to the new SQLite database file: %s", newDB+".new") return "", errors.New("Internal server error") } f.Close() @@ -224,7 +224,7 @@ func RetrieveDatabaseFile(bucket, id string) (newDB string, err error) { // Now that the database file has been fully written to disk, remove the .new on the end of the name err = os.Rename(newDB+".new", newDB) if err != nil { - log.Printf("Error when renaming .new database file to final form in the disk cache: %s\n", err.Error()) + log.Printf("Error when renaming .new database file to final form in the disk cache: %s", err.Error()) return "", errors.New("Internal server error") } } else { @@ -249,13 +249,13 @@ func StoreDatabaseFile(db *os.File, sha string, dbSize int64) error { // If a Minio bucket with the desired name doesn't already exist, create it found, err := minioClient.BucketExists(bkt) if err != nil { - log.Printf("Error when checking if Minio bucket '%s' already exists: %v\n", bkt, err) + log.Printf("Error when checking if Minio bucket '%s' already exists: %v", bkt, err) return err } if !found { err := minioClient.MakeBucket(bkt, "us-east-1") if err != nil { - log.Printf("Error creating Minio bucket '%v': %v\n", bkt, err) + log.Printf("Error creating Minio bucket '%v': %v", bkt, err) return err } } diff --git a/common/postgresql.go b/common/postgresql.go index 265c372cd..0b0558486 100644 --- a/common/postgresql.go +++ b/common/postgresql.go @@ -37,7 +37,7 @@ func AddDefaultUser() error { _, err := pdb.Exec(dbQuery, RandomString(16), "default", "default@dbhub.io", RandomString(16), "", "Default system user") if err != nil { - log.Printf("Error when adding the default user to the database: %v\n", err) + log.Printf("Error when adding the default user to the database: %v", err) // For now, don't bother logging a failure here. This *might* need changing later on return err } @@ -52,7 +52,7 @@ func AddUser(auth0ID, userName, password, email, displayName, avatarURL string) // Hash the user's password hash, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost) if err != nil { - log.Printf("Failed to hash user password. User: '%v', error: %v.\n", SanitiseLogString(userName), err) + log.Printf("Failed to hash user password. User: '%v', error: %v.", SanitiseLogString(userName), err) return err } @@ -61,7 +61,7 @@ func AddUser(auth0ID, userName, password, email, displayName, avatarURL string) if Conf.Sign.Enabled { cert, err = GenerateClientCert(userName) if err != nil { - log.Printf("Error when generating client certificate for '%s': %v\n", SanitiseLogString(userName), err) + log.Printf("Error when generating client certificate for '%s': %v", SanitiseLogString(userName), err) return err } } @@ -83,15 +83,15 @@ func AddUser(auth0ID, userName, password, email, displayName, avatarURL string) VALUES ($1, $2, $3, $4, $5, $6, $7)` commandTag, err := pdb.Exec(insertQuery, auth0ID, userName, email, hash, cert, dn, av) if err != nil { - log.Printf("Adding user to database failed: %v\n", err) + log.Printf("Adding user to database failed: %v", err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong number of rows affected when creating user: %v, username: %v\n", numRows, SanitiseLogString(userName)) + log.Printf("Wrong number of rows affected when creating user: %v, username: %v", numRows, SanitiseLogString(userName)) } // Log the user registration - log.Printf("User registered: '%s' Email: '%s'\n", SanitiseLogString(userName), email) + log.Printf("User registered: '%s' Email: '%s'", SanitiseLogString(userName), email) return nil } @@ -106,12 +106,12 @@ func APIKeySave(key, loggedInUser string, dateCreated time.Time) error { var keyCount int err := pdb.QueryRow(dbQuery, key).Scan(&keyCount) if err != nil { - log.Printf("Checking if an API key exists failed: %v\n", err) + log.Printf("Checking if an API key exists failed: %v", err) return err } if keyCount != 0 { // API key is already in our system - log.Printf("Duplicate API key (%s) generated for user '%s'\n", key, loggedInUser) + log.Printf("Duplicate API key (%s) generated for user '%s'", key, loggedInUser) return fmt.Errorf("API generator created duplicate key. Try again, just in case...") } @@ -121,11 +121,11 @@ func APIKeySave(key, loggedInUser string, dateCreated time.Time) error { SELECT (SELECT user_id FROM users WHERE lower(user_name) = lower($1)), $2, $3` commandTag, err := pdb.Exec(dbQuery, loggedInUser, key, dateCreated) if err != nil { - log.Printf("Adding API key to database failed: %v\n", err) + log.Printf("Adding API key to database failed: %v", err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong number of rows (%d) affected when adding API key: %v, username: %v\n", numRows, key, + log.Printf("Wrong number of rows (%d) affected when adding API key: %v, username: %v", numRows, key, loggedInUser) } return nil @@ -274,7 +274,7 @@ func CheckDBID(dbOwner string, dbID int64) (avail bool, dbName string, err error if err == pgx.ErrNoRows { avail = false } else { - log.Printf("Checking if a database exists failed: %v\n", err) + log.Printf("Checking if a database exists failed: %v", err) } return } @@ -308,7 +308,7 @@ func CheckDBStarred(loggedInUser, dbOwner, dbName string) (bool, error) { var starCount int err := pdb.QueryRow(dbQuery, dbOwner, dbName, loggedInUser).Scan(&starCount) if err != nil { - log.Printf("Error looking up star count for database. User: '%s' DB: '%s/%s'. Error: %v\n", + log.Printf("Error looking up star count for database. User: '%s' DB: '%s/%s'. Error: %v", loggedInUser, SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return true, err } @@ -345,7 +345,7 @@ func CheckDBWatched(loggedInUser, dbOwner, dbName string) (bool, error) { var watchCount int err := pdb.QueryRow(dbQuery, dbOwner, dbName, loggedInUser).Scan(&watchCount) if err != nil { - log.Printf("Error looking up watchers count for database. User: '%s' DB: '%s/%s'. Error: %v\n", + log.Printf("Error looking up watchers count for database. User: '%s' DB: '%s/%s'. Error: %v", loggedInUser, SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return true, err } @@ -370,7 +370,7 @@ func CheckEmailExists(email string) (bool, error) { var emailCount int err := pdb.QueryRow(dbQuery, email).Scan(&emailCount) if err != nil { - log.Printf("Database query failed: %v\n", err) + log.Printf("Database query failed: %v", err) return true, err } if emailCount == 0 { @@ -402,7 +402,7 @@ func CheckLicenceExists(userName, licenceName string) (exists bool, err error) { var count int err = pdb.QueryRow(dbQuery, userName, licenceName).Scan(&count) if err != nil { - log.Printf("Error checking if licence '%s' exists for user '%s' in database: %v\n", + log.Printf("Error checking if licence '%s' exists for user '%s' in database: %v", SanitiseLogString(licenceName), userName, err) return false, err } @@ -423,7 +423,7 @@ func CheckUserExists(userName string) (bool, error) { var userCount int err := pdb.QueryRow(dbQuery, userName).Scan(&userCount) if err != nil { - log.Printf("Database query failed: %v\n", err) + log.Printf("Database query failed: %v", err) return true, err } if userCount == 0 { @@ -439,11 +439,11 @@ func ConnectPostgreSQL() (err error) { pgPoolConfig := pgx.ConnPoolConfig{*pgConfig, Conf.Pg.NumConnections, nil, 2 * time.Second} pdb, err = pgx.NewConnPool(pgPoolConfig) if err != nil { - return fmt.Errorf("Couldn't connect to PostgreSQL server: %v\n", err) + return fmt.Errorf("Couldn't connect to PostgreSQL server: %v", err) } // Log successful connection - log.Printf("Connected to PostgreSQL server: %v:%v\n", Conf.Pg.Server, uint16(Conf.Pg.Port)) + log.Printf("Connected to PostgreSQL server: %v:%v", Conf.Pg.Server, uint16(Conf.Pg.Port)) return nil } @@ -462,7 +462,7 @@ func databaseID(dbOwner, dbName string) (dbID int, err error) { AND is_deleted = false` err = pdb.QueryRow(dbQuery, dbOwner, dbName).Scan(&dbID) if err != nil { - log.Printf("Error looking up database id. Owner: '%s', Database: '%s'. Error: %v\n", + log.Printf("Error looking up database id. Owner: '%s', Database: '%s'. Error: %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) } return @@ -492,7 +492,7 @@ func DB4SDefaultList(loggedInUser string) (UserInfoSlice, error) { ORDER BY last_modified DESC` rows, err := pdb.Query(dbQuery, loggedInUser) if err != nil { - log.Printf("Database query failed: %v\n", err) + log.Printf("Database query failed: %v", err) return nil, err } defer rows.Close() @@ -501,7 +501,7 @@ func DB4SDefaultList(loggedInUser string) (UserInfoSlice, error) { var oneRow UserInfo err = rows.Scan(&oneRow.Username, &oneRow.LastModified) if err != nil { - log.Printf("Error list of users with public databases: %v\n", err) + log.Printf("Error list of users with public databases: %v", err) return nil, err } unsorted[oneRow.Username] = oneRow @@ -536,7 +536,7 @@ func DB4SDefaultList(loggedInUser string) (UserInfoSlice, error) { userRow := UserInfo{Username: loggedInUser} rows, err = pdb.Query(dbQuery, loggedInUser) if err != nil { - log.Printf("Database query failed: %v\n", err) + log.Printf("Database query failed: %v", err) return nil, err } defer rows.Close() @@ -545,7 +545,7 @@ func DB4SDefaultList(loggedInUser string) (UserInfoSlice, error) { userHasDB = true err = rows.Scan(&userRow.LastModified) if err != nil { - log.Printf("Error retrieving database list for user: %v\n", err) + log.Printf("Error retrieving database list for user: %v", err) return nil, err } } @@ -679,7 +679,7 @@ func DBStars(dbOwner, dbName string) (starCount int, err error) { AND is_deleted = false` err = pdb.QueryRow(dbQuery, dbOwner, dbName).Scan(&starCount) if err != nil { - log.Printf("Error looking up star count for database '%s/%s'. Error: %v\n", SanitiseLogString(dbOwner), + log.Printf("Error looking up star count for database '%s/%s'. Error: %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return -1, err } @@ -701,7 +701,7 @@ func DBWatchers(dbOwner, dbName string) (watcherCount int, err error) { AND is_deleted = false` err = pdb.QueryRow(dbQuery, dbOwner, dbName).Scan(&watcherCount) if err != nil { - log.Printf("Error looking up watcher count for database '%s/%s'. Error: %v\n", + log.Printf("Error looking up watcher count for database '%s/%s'. Error: %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return -1, err } @@ -724,7 +724,7 @@ func DefaultCommit(dbOwner, dbName string) (string, error) { var commitID string err := pdb.QueryRow(dbQuery, dbOwner, dbName).Scan(&commitID) if err != nil { - log.Printf("Error when retrieving head commit ID of default branch: %v\n", err.Error()) + log.Printf("Error when retrieving head commit ID of default branch: %v", err.Error()) return "", errors.New("Internal error when looking up database details") } return commitID, nil @@ -763,12 +763,12 @@ func DeleteComment(dbOwner, dbName string, discID, comID int) error { AND com_id = $4` commandTag, err := tx.Exec(dbQuery, dbOwner, dbName, discID, comID) if err != nil { - log.Printf("Deleting comment '%d' from '%s/%s', discussion '%d' failed: %v\n", comID, + log.Printf("Deleting comment '%d' from '%s/%s', discussion '%d' failed: %v", comID, SanitiseLogString(dbOwner), SanitiseLogString(dbName), discID, err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong number of rows (%v) affected when deleting comment '%d' from database '%s/%s, discussion '%d''\n", + log.Printf("Wrong number of rows (%d) affected when deleting comment '%d' from database '%s/%s, discussion '%d''", numRows, comID, SanitiseLogString(dbOwner), SanitiseLogString(dbName), discID) } @@ -800,13 +800,13 @@ func DeleteComment(dbOwner, dbName string, discID, comID int) error { WHERE internal_id = (SELECT int_id FROM int)` commandTag, err = tx.Exec(dbQuery, dbOwner, dbName, discID) if err != nil { - log.Printf("Updating comment count for discussion '%v' of '%s/%s' in PostgreSQL failed: %v\n", + log.Printf("Updating comment count for discussion '%v' of '%s/%s' in PostgreSQL failed: %v", discID, SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong number of rows (%v) affected when updating comment count for discussion '%v' in "+ - "'%s/%s'\n", numRows, discID, SanitiseLogString(dbOwner), SanitiseLogString(dbName)) + log.Printf("Wrong number of rows (%d) affected when updating comment count for discussion '%v' in "+ + "'%s/%s'", numRows, discID, SanitiseLogString(dbOwner), SanitiseLogString(dbName)) } // Commit the transaction @@ -912,7 +912,7 @@ func DeleteDatabase(dbOwner, dbName string) error { return err } if numRows := commandTag.RowsAffected(); numRows != 1 && !isLive { // Skip this check when deleting live databases - log.Printf("Wrong number of rows (%v) affected (spot 1) when updating fork count for database '%s/%s'", + log.Printf("Wrong number of rows (%d) affected (spot 1) when updating fork count for database '%s/%s'", numRows, SanitiseLogString(dbOwner), SanitiseLogString(dbName)) } @@ -932,13 +932,13 @@ func DeleteDatabase(dbOwner, dbName string) error { AND db_name = $2` commandTag, err = tx.Exec(dbQuery, dbOwner, dbName, newName) if err != nil { - log.Printf("Deleting (forked) database entry failed for database '%s/%s': %v\n", + log.Printf("Deleting (forked) database entry failed for database '%s/%s': %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { log.Printf( - "Wrong number of rows (%v) affected when deleting (forked) database '%s/%s'\n", numRows, + "Wrong number of rows (%d) affected when deleting (forked) database '%s/%s'", numRows, SanitiseLogString(dbOwner), SanitiseLogString(dbName)) } @@ -968,7 +968,7 @@ func DeleteDatabase(dbOwner, dbName string) error { )` commandTag, err = tx.Exec(dbQuery, dbOwner, dbName) if err != nil { - log.Printf("Deleting (forked) database stars failed for database '%s/%s': %v\n", + log.Printf("Deleting (forked) database stars failed for database '%s/%s': %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return err } @@ -989,13 +989,13 @@ func DeleteDatabase(dbOwner, dbName string) error { AND db_name = $2` commandTag, err = tx.Exec(dbQuery, dbOwner, dbName, newName) if err != nil { - log.Printf("Deleting (forked) database entry failed for database '%s/%s': %v\n", + log.Printf("Deleting (forked) database entry failed for database '%s/%s': %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { log.Printf( - "Wrong number of rows (%v) affected when deleting (forked) database '%s/%s'\n", numRows, + "Wrong number of rows (%d) affected when deleting (forked) database '%s/%s'", numRows, SanitiseLogString(dbOwner), SanitiseLogString(dbName)) } @@ -1022,12 +1022,12 @@ func DeleteDatabase(dbOwner, dbName string) error { WHERE sqlite_databases.db_id = root_db.id` commandTag, err = tx.Exec(dbQuery, dbOwner, newName) if err != nil { - log.Printf("Updating fork count for '%s/%s' in PostgreSQL failed: %v\n", SanitiseLogString(dbOwner), + log.Printf("Updating fork count for '%s/%s' in PostgreSQL failed: %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong number of rows (%v) affected (spot 2) when updating fork count for database '%s/%s'\n", + log.Printf("Wrong number of rows (%d) affected (spot 2) when updating fork count for database '%s/%s'", numRows, SanitiseLogString(dbOwner), SanitiseLogString(dbName)) } @@ -1038,7 +1038,7 @@ func DeleteDatabase(dbOwner, dbName string) error { } // Log the database deletion - log.Printf("(Forked) database '%s/%s' deleted\n", SanitiseLogString(dbOwner), SanitiseLogString(dbName)) + log.Printf("(Forked) database '%s/%s' deleted", SanitiseLogString(dbOwner), SanitiseLogString(dbName)) return nil } @@ -1125,7 +1125,7 @@ func DeleteLicence(userName, licenceName string) (err error) { var DBCount int err = pdb.QueryRow(dbQuery, userName).Scan(&DBCount) if err != nil { - log.Printf("Checking if the licence is in use failed: %v\n", err) + log.Printf("Checking if the licence is in use failed: %v", err) return err } if DBCount != 0 { @@ -1150,12 +1150,12 @@ func DeleteLicence(userName, licenceName string) (err error) { ))` commandTag, err := tx.Exec(dbQuery, userName, licSHA, licenceName) if err != nil { - log.Printf("Error when retrieving sha256 for licence '%s', user '%s' from database: %v\n", + log.Printf("Error when retrieving sha256 for licence '%s', user '%s' from database: %v", SanitiseLogString(licenceName), userName, err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong number of rows (%v) affected when deleting licence '%s' for user '%s'\n", + log.Printf("Wrong number of rows (%d) affected when deleting licence '%s' for user '%s'", numRows, SanitiseLogString(licenceName), userName) } @@ -1173,11 +1173,11 @@ func DisconnectPostgreSQL() { pdb.Close() // Log successful disconnection - log.Printf("Disconnected from PostgreSQL server: %v:%v\n", Conf.Pg.Server, uint16(Conf.Pg.Port)) + log.Printf("Disconnected from PostgreSQL server: %v:%v", Conf.Pg.Server, uint16(Conf.Pg.Port)) } // Discussions returns the list of discussions or MRs for a given database -// If a non-0 discID value is passed, it will only return the details for that specific discussion/MR. Otherwise it +// If a non-0 discID value is passed, it will only return the details for that specific discussion/MR. Otherwise, it // will return a list of all discussions or MRs for a given database // Note - This returns a slice of DiscussionEntry, instead of a map. We use a slice because it lets us use an ORDER // @@ -1211,7 +1211,7 @@ func Discussions(dbOwner, dbName string, discType DiscussionType, discID int) (l var rows *pgx.Rows rows, err = pdb.Query(dbQuery, dbOwner, dbName, discType) if err != nil { - log.Printf("Database query failed: %v\n", err) + log.Printf("Database query failed: %v", err) return } for rows.Next() { @@ -1222,7 +1222,7 @@ func Discussions(dbOwner, dbName string, discType DiscussionType, discID int) (l &oneRow.Body, &oneRow.LastModified, &oneRow.CommentCount, &sdb, &sb, &db, &oneRow.MRDetails.State, &oneRow.MRDetails.Commits) if err != nil { - log.Printf("Error retrieving discussion/MR list for database '%s/%s': %v\n", + log.Printf("Error retrieving discussion/MR list for database '%s/%s': %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) rows.Close() return @@ -1261,7 +1261,7 @@ func Discussions(dbOwner, dbName string, discType DiscussionType, discID int) (l var o, n pgx.NullString err2 := pdb.QueryRow(dbQuery, j.MRDetails.SourceDBID).Scan(&o, &n) if err2 != nil && err2 != pgx.ErrNoRows { - log.Printf("Retrieving source database owner/name failed: %v\n", err) + log.Printf("Retrieving source database owner/name failed: %v", err) return } if o.Valid { @@ -1315,7 +1315,7 @@ func DiscussionComments(dbOwner, dbName string, discID, comID int) (list []Discu var rows *pgx.Rows rows, err = pdb.Query(dbQuery, dbOwner, dbName, discID) if err != nil { - log.Printf("Database query failed: %v\n", err) + log.Printf("Database query failed: %v", err) return } for rows.Next() { @@ -1323,7 +1323,7 @@ func DiscussionComments(dbOwner, dbName string, discID, comID int) (list []Discu var oneRow DiscussionCommentEntry err = rows.Scan(&oneRow.ID, &oneRow.Commenter, &em, &av, &oneRow.DateCreated, &oneRow.Body, &oneRow.EntryType) if err != nil { - log.Printf("Error retrieving comment list for database '%s/%s', discussion '%d': %v\n", + log.Printf("Error retrieving comment list for database '%s/%s', discussion '%d': %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), discID, err) rows.Close() return @@ -1353,7 +1353,7 @@ func FlushViewCount() { } // Log the start of the loop - log.Printf("Periodic view count flushing loop started. %d second refresh.\n", + log.Printf("Periodic view count flushing loop started. %d second refresh.", Conf.Memcache.ViewCountFlushDelay) // Start the endless flush loop @@ -1369,7 +1369,7 @@ func FlushViewCount() { AND db.user_id = users.user_id` rows, err = pdb.Query(dbQuery) if err != nil { - log.Printf("Database query failed: %v\n", err) + log.Printf("Database query failed: %v", err) return } var dbList []dbEntry @@ -1377,7 +1377,7 @@ func FlushViewCount() { var oneRow dbEntry err = rows.Scan(&oneRow.Owner, &oneRow.Name) if err != nil { - log.Printf("Error retrieving database list for view count flush thread: %v\n", err) + log.Printf("Error retrieving database list for view count flush thread: %v", err) rows.Close() return } @@ -1393,7 +1393,7 @@ func FlushViewCount() { // Retrieve the view count from Memcached newValue, err := GetViewCount(dbOwner, dbName) if err != nil { - log.Printf("Error when getting memcached view count for %s/%s: %s\n", dbOwner, dbName, + log.Printf("Error when getting memcached view count for %s/%s: %s", dbOwner, dbName, err.Error()) continue } @@ -1412,11 +1412,11 @@ func FlushViewCount() { AND db_name = $2` commandTag, err := pdb.Exec(dbQuery, dbOwner, dbName, newValue) if err != nil { - log.Printf("Flushing view count for '%s/%s' failed: %v\n", dbOwner, dbName, err) + log.Printf("Flushing view count for '%s/%s' failed: %v", dbOwner, dbName, err) continue } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong number of rows affected (%v) when flushing view count for '%s/%s'\n", + log.Printf("Wrong number of rows affected (%v) when flushing view count for '%s/%s'", numRows, dbOwner, dbName) continue } @@ -1453,13 +1453,13 @@ func ForkDatabase(srcOwner, dbName, dstOwner string) (newForkCount int, err erro AND db_name = $3` commandTag, err := pdb.Exec(dbQuery, dstOwner, srcOwner, dbName) if err != nil { - log.Printf("Forking database '%s/%s' in PostgreSQL failed: %v\n", SanitiseLogString(srcOwner), + log.Printf("Forking database '%s/%s' in PostgreSQL failed: %v", SanitiseLogString(srcOwner), SanitiseLogString(dbName), err) return 0, err } if numRows := commandTag.RowsAffected(); numRows != 1 { log.Printf("Wrong number of rows affected (%d) when forking main database entry: "+ - "'%s/%s' to '%s/%s'\n", numRows, SanitiseLogString(srcOwner), SanitiseLogString(dbName), + "'%s/%s' to '%s/%s'", numRows, SanitiseLogString(srcOwner), SanitiseLogString(dbName), dstOwner, SanitiseLogString(dbName)) } @@ -1487,7 +1487,7 @@ func ForkDatabase(srcOwner, dbName, dstOwner string) (newForkCount int, err erro RETURNING new_count.forks - 1` err = pdb.QueryRow(dbQuery, dstOwner, dbName).Scan(&newForkCount) if err != nil { - log.Printf("Updating fork count in PostgreSQL failed: %v\n", err) + log.Printf("Updating fork count in PostgreSQL failed: %v", err) return 0, err } return newForkCount, nil @@ -1508,7 +1508,7 @@ func ForkedFrom(dbOwner, dbName string) (forkOwn, forkDB string, forkDel bool, e AND db_name = $2` err = pdb.QueryRow(dbQuery, dbOwner, dbName).Scan(&dbID, &forkedFrom) if err != nil { - log.Printf("Error checking if database was forked from another '%s/%s'. Error: %v\n", + log.Printf("Error checking if database was forked from another '%s/%s'. Error: %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return "", "", false, err } @@ -1525,7 +1525,7 @@ func ForkedFrom(dbOwner, dbName string) (forkOwn, forkDB string, forkDel bool, e AND u.user_id = db.user_id` err = pdb.QueryRow(dbQuery, forkedFrom).Scan(&forkOwn, &forkDB, &forkDel) if err != nil { - log.Printf("Error retrieving forked database information for '%s/%s'. Error: %v\n", + log.Printf("Error retrieving forked database information for '%s/%s'. Error: %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return "", "", false, err } @@ -1557,7 +1557,7 @@ func ForkParent(loggedInUser, dbOwner, dbName string) (parentOwner, parentDBName ORDER BY db.forked_from NULLS FIRST` rows, err := pdb.Query(dbQuery, dbOwner, dbName) if err != nil { - log.Printf("Database query failed: %v\n", err) + log.Printf("Database query failed: %v", err) return } defer rows.Close() @@ -1567,7 +1567,7 @@ func ForkParent(loggedInUser, dbOwner, dbName string) (parentOwner, parentDBName var oneRow ForkEntry err = rows.Scan(&oneRow.Owner, &oneRow.DBName, &oneRow.Public, &oneRow.ID, &frk, &oneRow.Deleted) if err != nil { - log.Printf("Error retrieving fork parent for '%s/%s': %v\n", dbOwner, dbName, + log.Printf("Error retrieving fork parent for '%s/%s': %v", dbOwner, dbName, err) return } @@ -1580,7 +1580,7 @@ func ForkParent(loggedInUser, dbOwner, dbName string) (parentOwner, parentDBName // Safety check numResults := len(dbList) if numResults == 0 { - err = fmt.Errorf("Empty list returned instead of fork tree. This shouldn't happen") + err = fmt.Errorf("Empty list returned instead of fork tree. This shouldn't happen.") return } @@ -1633,7 +1633,7 @@ func ForkTree(loggedInUser, dbOwner, dbName string) (outputList []ForkEntry, err ORDER BY db.forked_from NULLS FIRST` rows, err := pdb.Query(dbQuery, dbOwner, dbName) if err != nil { - log.Printf("Database query failed: %v\n", err) + log.Printf("Database query failed: %v", err) return nil, err } defer rows.Close() @@ -1643,8 +1643,7 @@ func ForkTree(loggedInUser, dbOwner, dbName string) (outputList []ForkEntry, err var oneRow ForkEntry err = rows.Scan(&oneRow.Owner, &oneRow.DBName, &oneRow.Public, &oneRow.ID, &frk, &oneRow.Deleted) if err != nil { - log.Printf("Error retrieving fork list for '%s/%s': %v\n", dbOwner, dbName, - err) + log.Printf("Error retrieving fork list for '%s/%s': %v", dbOwner, dbName, err) return nil, err } if frk.Valid { @@ -1656,12 +1655,12 @@ func ForkTree(loggedInUser, dbOwner, dbName string) (outputList []ForkEntry, err // Safety checks numResults := len(dbList) if numResults == 0 { - return nil, errors.New("Empty list returned instead of fork tree. This shouldn't happen") + return nil, errors.New("Empty list returned instead of fork tree. This shouldn't happen.") } if dbList[0].ForkedFrom != 0 { // The first entry has a non-zero forked_from field, indicating it's not the root entry. That // shouldn't happen, so return an error. - return nil, errors.New("Incorrect root entry data in retrieved database list") + return nil, errors.New("Incorrect root entry data in retrieved database list.") } // * Process the root entry * @@ -1767,7 +1766,7 @@ func GetActivityStats() (stats ActivityStats, err error) { ORDER BY count DESC, max ASC` starRows, err := pdb.Query(dbQuery) if err != nil { - log.Printf("Database query failed: %v\n", err) + log.Printf("Database query failed: %v", err) return } defer starRows.Close() @@ -1775,7 +1774,7 @@ func GetActivityStats() (stats ActivityStats, err error) { var oneRow ActivityRow err = starRows.Scan(&oneRow.Owner, &oneRow.DBName, &oneRow.Count) if err != nil { - log.Printf("Error retrieving list of most starred databases: %v\n", err) + log.Printf("Error retrieving list of most starred databases: %v", err) return } stats.Starred = append(stats.Starred, oneRow) @@ -1793,7 +1792,7 @@ func GetActivityStats() (stats ActivityStats, err error) { LIMIT 5` forkRows, err := pdb.Query(dbQuery) if err != nil { - log.Printf("Database query failed: %v\n", err) + log.Printf("Database query failed: %v", err) return } defer forkRows.Close() @@ -1801,7 +1800,7 @@ func GetActivityStats() (stats ActivityStats, err error) { var oneRow ActivityRow err = forkRows.Scan(&oneRow.Owner, &oneRow.DBName, &oneRow.Count) if err != nil { - log.Printf("Error retrieving list of most forked databases: %v\n", err) + log.Printf("Error retrieving list of most forked databases: %v", err) return } stats.Forked = append(stats.Forked, oneRow) @@ -1819,7 +1818,7 @@ func GetActivityStats() (stats ActivityStats, err error) { LIMIT 5` upRows, err := pdb.Query(dbQuery) if err != nil { - log.Printf("Database query failed: %v\n", err) + log.Printf("Database query failed: %v", err) return } defer upRows.Close() @@ -1827,7 +1826,7 @@ func GetActivityStats() (stats ActivityStats, err error) { var oneRow UploadRow err = upRows.Scan(&oneRow.Owner, &oneRow.DBName, &oneRow.UploadDate) if err != nil { - log.Printf("Error retrieving list of most recent uploads: %v\n", err) + log.Printf("Error retrieving list of most recent uploads: %v", err) return } stats.Uploads = append(stats.Uploads, oneRow) @@ -1845,7 +1844,7 @@ func GetActivityStats() (stats ActivityStats, err error) { LIMIT 5` dlRows, err := pdb.Query(dbQuery) if err != nil { - log.Printf("Database query failed: %v\n", err) + log.Printf("Database query failed: %v", err) return } defer dlRows.Close() @@ -1853,7 +1852,7 @@ func GetActivityStats() (stats ActivityStats, err error) { var oneRow ActivityRow err = dlRows.Scan(&oneRow.Owner, &oneRow.DBName, &oneRow.Count) if err != nil { - log.Printf("Error retrieving list of most downloaded databases: %v\n", err) + log.Printf("Error retrieving list of most downloaded databases: %v", err) return } stats.Downloads = append(stats.Downloads, oneRow) @@ -1871,7 +1870,7 @@ func GetActivityStats() (stats ActivityStats, err error) { LIMIT 5` viewRows, err := pdb.Query(dbQuery) if err != nil { - log.Printf("Database query failed: %v\n", err) + log.Printf("Database query failed: %v", err) return } defer viewRows.Close() @@ -1879,7 +1878,7 @@ func GetActivityStats() (stats ActivityStats, err error) { var oneRow ActivityRow err = viewRows.Scan(&oneRow.Owner, &oneRow.DBName, &oneRow.Count) if err != nil { - log.Printf("Error retrieving list of most viewed databases: %v\n", err) + log.Printf("Error retrieving list of most viewed databases: %v", err) return } stats.Viewed = append(stats.Viewed, oneRow) @@ -1902,7 +1901,7 @@ func GetBranches(dbOwner, dbName string) (branches map[string]BranchEntry, err e AND db.db_name = $2` err = pdb.QueryRow(dbQuery, dbOwner, dbName).Scan(&branches) if err != nil { - log.Printf("Error when retrieving branch heads for database '%s/%s': %v\n", SanitiseLogString(dbOwner), + log.Printf("Error when retrieving branch heads for database '%s/%s': %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return nil, err } @@ -1921,7 +1920,7 @@ func GetAPIKeys(user string) ([]APIKey, error) { )` rows, err := pdb.Query(dbQuery, user) if err != nil { - log.Printf("Database query failed: %v\n", err) + log.Printf("Database query failed: %v", err) return nil, err } defer rows.Close() @@ -1931,7 +1930,7 @@ func GetAPIKeys(user string) ([]APIKey, error) { var dateCreated time.Time err = rows.Scan(&key, &dateCreated) if err != nil { - log.Printf("Error retrieving API key list: %v\n", err) + log.Printf("Error retrieving API key list: %v", err) return nil, err } keys = append(keys, APIKey{Key: key, DateCreated: dateCreated}) @@ -1969,7 +1968,7 @@ func GetCommitList(dbOwner, dbName string) (map[string]CommitEntry, error) { var l map[string]CommitEntry err := pdb.QueryRow(dbQuery, dbOwner, dbName).Scan(&l) if err != nil { - log.Printf("Retrieving commit list for '%s/%s' failed: %v\n", SanitiseLogString(dbOwner), + log.Printf("Retrieving commit list for '%s/%s' failed: %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return map[string]CommitEntry{}, err } @@ -1992,10 +1991,10 @@ func GetDefaultBranchName(dbOwner, dbName string) (branchName string, err error) err = pdb.QueryRow(dbQuery, dbOwner, dbName).Scan(&b) if err != nil { if err != pgx.ErrNoRows { - log.Printf("Error when retrieving default branch name for database '%s/%s': %v\n", + log.Printf("Error when retrieving default branch name for database '%s/%s': %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) } else { - log.Printf("No default branch name exists for database '%s/%s'. This shouldn't happen\n", + log.Printf("No default branch name exists for database '%s/%s'. This shouldn't happen", SanitiseLogString(dbOwner), SanitiseLogString(dbName)) } return @@ -2022,7 +2021,7 @@ func GetDefaultTableName(dbOwner, dbName string) (tableName string, err error) { err = pdb.QueryRow(dbQuery, dbOwner, dbName).Scan(&t) if err != nil { if err != pgx.ErrNoRows { - log.Printf("Error when retrieving default table name for database '%s/%s': %v\n", + log.Printf("Error when retrieving default table name for database '%s/%s': %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return } @@ -2051,11 +2050,11 @@ func GetDiscussionAndMRCount(dbOwner, dbName string) (discCount, mrCount int, er err = pdb.QueryRow(dbQuery, dbOwner, dbName).Scan(&discCount, &mrCount) if err != nil { if err != pgx.ErrNoRows { - log.Printf("Error when retrieving discussion and MR count for database '%s/%s': %v\n", + log.Printf("Error when retrieving discussion and MR count for database '%s/%s': %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) } else { log.Printf("Database '%s/%s' not found when attempting to retrieve discussion and MR count. This"+ - "shouldn't happen\n", SanitiseLogString(dbOwner), SanitiseLogString(dbName)) + "shouldn't happen", SanitiseLogString(dbOwner), SanitiseLogString(dbName)) } return } @@ -2086,7 +2085,7 @@ func GetLicence(userName, licenceName string) (txt, format string, err error) { // The requested licence text wasn't found return "", "", errors.New("unknown licence") } - log.Printf("Error when retrieving licence '%s', user '%s': %v\n", SanitiseLogString(licenceName), userName, err) + log.Printf("Error when retrieving licence '%s', user '%s': %v", SanitiseLogString(licenceName), userName, err) return "", "", err } return txt, format, nil @@ -2109,7 +2108,7 @@ func GetLicences(user string) (map[string]LicenceEntry, error) { )` rows, err := pdb.Query(dbQuery, user) if err != nil { - log.Printf("Database query failed: %v\n", err) + log.Printf("Database query failed: %v", err) return nil, err } defer rows.Close() @@ -2119,7 +2118,7 @@ func GetLicences(user string) (map[string]LicenceEntry, error) { var oneRow LicenceEntry err = rows.Scan(&name, &oneRow.FullName, &oneRow.Sha256, &oneRow.URL, &oneRow.FileFormat, &oneRow.Order) if err != nil { - log.Printf("Error retrieving licence list: %v\n", err) + log.Printf("Error retrieving licence list: %v", err) return nil, err } lics[name] = oneRow @@ -2148,7 +2147,7 @@ func GetLicenceInfoFromSha256(userName, sha256 string) (lName, lURL string, err ))` rows, err := pdb.Query(dbQuery, userName, sha256) if err != nil { - log.Printf("Error when retrieving friendly name for licence sha256 '%s', user '%s': %v\n", sha256, + log.Printf("Error when retrieving friendly name for licence sha256 '%s', user '%s': %v", sha256, SanitiseLogString(userName), err) return "", "", err } @@ -2163,7 +2162,7 @@ func GetLicenceInfoFromSha256(userName, sha256 string) (lName, lURL string, err var oneRow lic err = rows.Scan(&oneRow.User, &oneRow.Name, &oneRow.Licence) if err != nil { - log.Printf("Error retrieving friendly name for licence sha256 '%s', user: %v\n", sha256, err) + log.Printf("Error retrieving friendly name for licence sha256 '%s', user: %v", sha256, err) return "", "", err } list = append(list, oneRow) @@ -2196,7 +2195,7 @@ func GetLicenceInfoFromSha256(userName, sha256 string) (lName, lURL string, err if lName == "" { // Multiple licence friendly names were returned, but none of them matched the requesting user. Something has // gone wrong - return "", "", fmt.Errorf("Multiple matching licences found, but belonging to user %s\n", userName) + return "", "", fmt.Errorf("Multiple matching licences found, but belonging to user %s", userName) } // To get here we must have successfully picked a user defined licence out of several matches. This seems like @@ -2222,7 +2221,7 @@ func GetLicenceSha256FromName(userName, licenceName string) (sha256 string, err ))` err = pdb.QueryRow(dbQuery, userName, licenceName).Scan(&sha256) if err != nil { - log.Printf("Error when retrieving sha256 for licence '%s', user '%s' from database: %v\n", + log.Printf("Error when retrieving sha256 for licence '%s', user '%s' from database: %v", SanitiseLogString(licenceName), userName, err) return "", err } @@ -2246,7 +2245,7 @@ func GetReleases(dbOwner, dbName string) (releases map[string]ReleaseEntry, err AND db_name = $2` err = pdb.QueryRow(dbQuery, dbOwner, dbName).Scan(&releases) if err != nil { - log.Printf("Error when retrieving releases for database '%s/%s': %v\n", SanitiseLogString(dbOwner), + log.Printf("Error when retrieving releases for database '%s/%s': %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return nil, err } @@ -2339,7 +2338,7 @@ func GetTags(dbOwner, dbName string) (tags map[string]TagEntry, err error) { AND db_name = $2` err = pdb.QueryRow(dbQuery, dbOwner, dbName).Scan(&tags) if err != nil { - log.Printf("Error when retrieving tags for database '%s/%s': %v\n", SanitiseLogString(dbOwner), + log.Printf("Error when retrieving tags for database '%s/%s': %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return nil, err } @@ -2364,7 +2363,7 @@ func GetUsernameFromEmail(email string) (userName, avatarURL string, err error) err = nil return } - log.Printf("Looking up username for email address '%s' failed: %v\n", SanitiseLogString(email), err) + log.Printf("Looking up username for email address '%s' failed: %v", SanitiseLogString(email), err) return } @@ -2406,7 +2405,7 @@ func GetVisualisationData(dbOwner, dbName, commitID, hash string) (data []VisRow // A real database error occurred err = e - log.Printf("Checking if a database exists failed: %v\n", e) + log.Printf("Checking if a database exists failed: %v", e) return } @@ -2442,7 +2441,7 @@ func GetVisualisationParams(dbOwner, dbName, visName string) (params VisParamsV2 // A real database error occurred err = e - log.Printf("Retrieving visualisation parameters for '%s/%s', visualisation '%s' failed: %v\n", + log.Printf("Retrieving visualisation parameters for '%s/%s', visualisation '%s' failed: %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), SanitiseLogString(visName), e) return } @@ -2479,7 +2478,7 @@ func GetVisualisations(dbOwner, dbName string) (visNames []string, err error) { // A real database error occurred err = e - log.Printf("Retrieving visualisation list for '%s/%s' failed: %v\n", dbOwner, dbName, e) + log.Printf("Retrieving visualisation list for '%s/%s' failed: %v", dbOwner, dbName, e) return } defer rows.Close() @@ -2509,12 +2508,12 @@ func IncrementDownloadCount(dbOwner, dbName string) error { AND db_name = $2` commandTag, err := pdb.Exec(dbQuery, dbOwner, dbName) if err != nil { - log.Printf("Increment download count for '%s/%s' failed: %v\n", SanitiseLogString(dbOwner), + log.Printf("Increment download count for '%s/%s' failed: %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - errMsg := fmt.Sprintf("Wrong number of rows affected (%v) when incrementing download count for '%s/%s'\n", + errMsg := fmt.Sprintf("Wrong number of rows affected (%v) when incrementing download count for '%s/%s'", numRows, dbOwner, dbName) log.Printf(SanitiseLogString(errMsg)) return errors.New(errMsg) @@ -2552,7 +2551,7 @@ func LiveAddDatabasePG(dbOwner, dbName, bucketName, liveNode string, accessType return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong number of rows (%v) affected while storing LIVE database '%s/%s'", numRows, + log.Printf("Wrong number of rows (%d) affected while storing LIVE database '%s/%s'", numRows, SanitiseLogString(dbOwner), SanitiseLogString(dbName)) } return nil @@ -2576,7 +2575,8 @@ func LiveExecuteSQLDelete(dbOwner, sqlName string) (err error) { return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong number of rows (%v) affected while deleting SQL statement '%s' for user '%s'", numRows, SanitiseLogString(sqlName), SanitiseLogString(dbOwner)) + log.Printf("Wrong number of rows (%d) affected while deleting SQL statement '%s' for user '%s'", numRows, + SanitiseLogString(sqlName), SanitiseLogString(dbOwner)) } return } @@ -2669,7 +2669,8 @@ func LiveExecuteSQLSave(dbOwner, sqlName, sqlText string) (err error) { return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong number of rows (%d) affected while saving SQL statement '%s' for user '%s'", numRows, SanitiseLogString(sqlName), SanitiseLogString(dbOwner)) + log.Printf("Wrong number of rows (%d) affected while saving SQL statement '%s' for user '%s'", numRows, + SanitiseLogString(sqlName), SanitiseLogString(dbOwner)) } return } @@ -2700,7 +2701,7 @@ func LiveGenerateMinioNames(userName string) (bucketName, objectName string, err return } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong number of rows (%v) affected while updating the Minio bucket name for user '%s'", + log.Printf("Wrong number of rows (%d) affected while updating the Minio bucket name for user '%s'", numRows, userName) } } @@ -2759,7 +2760,7 @@ func LiveUserDBs(dbOwner string) (list []DBInfo, err error) { var oneRow DBInfo err = rows.Scan(&oneRow.Database, &oneRow.DateCreated, &oneRow.Public) if err != nil { - log.Printf("Error when retrieving list of live databases for user '%s': %v\n", dbOwner, err) + log.Printf("Error when retrieving list of live databases for user '%s': %v", dbOwner, err) return nil, err } list = append(list, oneRow) @@ -2770,7 +2771,7 @@ func LiveUserDBs(dbOwner string) (list []DBInfo, err error) { // LogDB4SConnect creates a DB4S default browse list entry func LogDB4SConnect(userAcc, ipAddr, userAgent string, downloadDate time.Time) error { if Conf.DB4S.Debug { - log.Printf("User '%s' just connected with '%s' and generated the default browse list\n", userAcc, SanitiseLogString(userAgent)) + log.Printf("User '%s' just connected with '%s' and generated the default browse list", userAcc, SanitiseLogString(userAgent)) } // If the user account isn't "public", then we look up the user id and store the info with the request @@ -2783,7 +2784,7 @@ func LogDB4SConnect(userAcc, ipAddr, userAgent string, downloadDate time.Time) e err := pdb.QueryRow(dbQuery, userAcc).Scan(&userID) if err != nil { - log.Printf("Looking up the user ID failed: %v\n", err) + log.Printf("Looking up the user ID failed: %v", err) return err } if userID == 0 { @@ -2798,11 +2799,11 @@ func LogDB4SConnect(userAcc, ipAddr, userAgent string, downloadDate time.Time) e VALUES ($1, $2, $3, $4)` commandTag, err := pdb.Exec(dbQuery, userID, ipAddr, userAgent, downloadDate) if err != nil { - log.Printf("Storing record of DB4S connection failed: %v\n", err) + log.Printf("Storing record of DB4S connection failed: %v", err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong number of rows (%v) affected while storing DB4S connection record for user '%v'\n", numRows, userAcc) + log.Printf("Wrong number of rows (%d) affected while storing DB4S connection record for user '%s'", numRows, userAcc) } return nil } @@ -2833,12 +2834,12 @@ func LogDownload(dbOwner, dbName, loggedInUser, ipAddr, serverSw, userAgent stri commandTag, err := pdb.Exec(dbQuery, dbOwner, dbName, downloader, ipAddr, serverSw, userAgent, downloadDate, sha) if err != nil { - log.Printf("Storing record of download '%s/%s', sha '%s' by '%v' failed: %v\n", SanitiseLogString(dbOwner), + log.Printf("Storing record of download '%s/%s', sha '%s' by '%v' failed: %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), sha, downloader, err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong number of rows (%v) affected while storing download record for '%s/%s'\n", numRows, + log.Printf("Wrong number of rows (%d) affected while storing download record for '%s/%s'", numRows, SanitiseLogString(dbOwner), SanitiseLogString(dbName)) } return nil @@ -2852,11 +2853,11 @@ func LogSQLiteQueryAfter(insertID, memUsed, memHighWater int64) (err error) { WHERE query_run_id = $1` commandTag, err := pdb.Exec(dbQuery, insertID, memUsed, memHighWater) if err != nil { - log.Printf("Adding memory stats for SQLite query run '%d' failed: %v\n", insertID, err) + log.Printf("Adding memory stats for SQLite query run '%d' failed: %v", insertID, err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong number of rows (%v) affected while adding memory stats for SQLite query run '%d'\n", + log.Printf("Wrong number of rows (%d) affected while adding memory stats for SQLite query run '%d'", numRows, insertID) } return nil @@ -2892,7 +2893,7 @@ func LogSQLiteQueryBefore(source, dbOwner, dbName, loggedInUser, ipAddr, userAge var insertID int64 err := pdb.QueryRow(dbQuery, dbOwner, dbName, queryUser, ipAddr, userAgent, encodedQuery, source).Scan(&insertID) if err != nil { - log.Printf("Storing record of user SQLite query '%v' on '%s/%s' failed: %v\n", encodedQuery, + log.Printf("Storing record of user SQLite query '%v' on '%s/%s' failed: %v", encodedQuery, SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return 0, err } @@ -2925,12 +2926,12 @@ func LogUpload(dbOwner, dbName, loggedInUser, ipAddr, serverSw, userAgent string commandTag, err := pdb.Exec(dbQuery, dbOwner, dbName, uploader, ipAddr, serverSw, userAgent, uploadDate, sha) if err != nil { - log.Printf("Storing record of upload '%s/%s', sha '%s' by '%v' failed: %v\n", SanitiseLogString(dbOwner), + log.Printf("Storing record of upload '%s/%s', sha '%s' by '%v' failed: %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), sha, uploader, err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong number of rows (%v) affected while storing upload record for '%s/%s'\n", numRows, + log.Printf("Wrong number of rows (%d) affected while storing upload record for '%s/%s'", numRows, SanitiseLogString(dbOwner), SanitiseLogString(dbName)) } return nil @@ -2976,7 +2977,7 @@ func MinioLocation(dbOwner, dbName, commitID, loggedInUser string) (minioBucket, var sha, mod string err = pdb.QueryRow(dbQuery, dbOwner, dbName, commitID).Scan(&sha, &mod) if err != nil { - log.Printf("Error retrieving MinioID for '%s/%s' version '%v' by logged in user '%v': %v\n", + log.Printf("Error retrieving MinioID for '%s/%s' version '%v' by logged in user '%v': %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), SanitiseLogString(commitID), loggedInUser, err) return // Bucket and ID are still the initial default empty string } @@ -3033,7 +3034,7 @@ func PrefUserMaxRows(loggedInUser string) int { var maxRows int err := pdb.QueryRow(dbQuery, loggedInUser).Scan(&maxRows) if err != nil { - log.Printf("Error retrieving user '%s' preference data: %v\n", loggedInUser, err) + log.Printf("Error retrieving user '%s' preference data: %v", loggedInUser, err) return DefaultNumDisplayRows // Use the default value } return maxRows @@ -3053,19 +3054,19 @@ func RenameDatabase(userName, dbName, newName string) error { AND db_name = $2` commandTag, err := pdb.Exec(dbQuery, userName, dbName, newName) if err != nil { - log.Printf("Renaming database '%s/%s' failed: %v\n", SanitiseLogString(userName), + log.Printf("Renaming database '%s/%s' failed: %v", SanitiseLogString(userName), SanitiseLogString(dbName), err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - errMsg := fmt.Sprintf("Wrong number of rows affected (%v) when renaming '%s/%s' to '%s/%s'\n", + errMsg := fmt.Sprintf("Wrong number of rows affected (%d) when renaming '%s/%s' to '%s/%s'", numRows, userName, dbName, userName, newName) log.Printf(SanitiseLogString(errMsg)) return errors.New(errMsg) } // Log the rename - log.Printf("Database renamed from '%s/%s' to '%s/%s'\n", SanitiseLogString(userName), SanitiseLogString(dbName), + log.Printf("Database renamed from '%s/%s' to '%s/%s'", SanitiseLogString(userName), SanitiseLogString(dbName), SanitiseLogString(userName), SanitiseLogString(newName)) return nil } @@ -3124,7 +3125,7 @@ func ResetDB() error { dbQuery := fmt.Sprintf("TRUNCATE TABLE %v CASCADE", tbl) _, err := pdb.Exec(dbQuery) if err != nil { - log.Printf("Error truncating table while resetting database: %v\n", err) + log.Printf("Error truncating table while resetting database: %v", err) return err } } @@ -3134,7 +3135,7 @@ func ResetDB() error { dbQuery := fmt.Sprintf("ALTER SEQUENCE %v RESTART", seq) _, err := pdb.Exec(dbQuery) if err != nil { - log.Printf("Error restarting sequence while resetting database: %v\n", err) + log.Printf("Error restarting sequence while resetting database: %v", err) return err } } @@ -3199,12 +3200,12 @@ func SaveDBSettings(userName, dbName, oneLineDesc, fullDesc, defaultTable string commandTag, err := pdb.Exec(SQLQuery, userName, dbName, nullable1LineDesc, nullableFullDesc, defaultTable, public, nullableSourceURL, defaultBranch) if err != nil { - log.Printf("Updating description for database '%s/%s' failed: %v\n", SanitiseLogString(userName), + log.Printf("Updating description for database '%s/%s' failed: %v", SanitiseLogString(userName), SanitiseLogString(dbName), err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - errMsg := fmt.Sprintf("Wrong number of rows affected (%v) when updating description for '%s/%s'\n", + errMsg := fmt.Sprintf("Wrong number of rows affected (%d) when updating description for '%s/%s'", numRows, userName, dbName) log.Printf(SanitiseLogString(errMsg)) return errors.New(errMsg) @@ -3214,7 +3215,7 @@ func SaveDBSettings(userName, dbName, oneLineDesc, fullDesc, defaultTable string err = InvalidateCacheEntry(userName, userName, dbName, "") // Empty string indicates "for all versions" if err != nil { // Something went wrong when invalidating memcached entries for the database - log.Printf("Error when invalidating memcache entries: %s\n", err.Error()) + log.Printf("Error when invalidating memcache entries: %s", err.Error()) return err } return nil @@ -3303,12 +3304,11 @@ func SetClientCert(newCert []byte, userName string) error { WHERE lower(user_name) = lower($2)` commandTag, err := pdb.Exec(SQLQuery, newCert, userName) if err != nil { - log.Printf("Updating client certificate for '%s' failed: %v\n", userName, err) + log.Printf("Updating client certificate for '%s' failed: %v", userName, err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - errMsg := fmt.Sprintf("Wrong number of rows affected (%v) when storing client cert for '%s'\n", - numRows, userName) + errMsg := fmt.Sprintf("Wrong number of rows affected (%d) when storing client cert for '%s'", numRows, userName) log.Printf(errMsg) return errors.New(errMsg) } @@ -3323,11 +3323,11 @@ func SetUserPreferences(userName string, maxRows int, displayName, email string) WHERE lower(user_name) = lower($1)` commandTag, err := pdb.Exec(dbQuery, userName, maxRows, displayName, email) if err != nil { - log.Printf("Updating user preferences failed for user '%s'. Error: '%v'\n", userName, err) + log.Printf("Updating user preferences failed for user '%s'. Error: '%v'", userName, err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong # of rows (%v) affected when updating user preferences. User: '%s'\n", numRows, + log.Printf("Wrong # of rows (%v) affected when updating user preferences. User: '%s'", numRows, userName) } return nil @@ -3350,7 +3350,7 @@ func SocialStats(dbOwner, dbName string) (wa, st, fo int, err error) { AND db_name = $2` err = pdb.QueryRow(dbQuery, dbOwner, dbName).Scan(&st, &fo, &wa) if err != nil { - log.Printf("Error retrieving social stats count for '%s/%s': %v\n", SanitiseLogString(dbOwner), + log.Printf("Error retrieving social stats count for '%s/%s': %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return -1, -1, -1, err } @@ -3409,7 +3409,7 @@ func StatusUpdatesLoop() { ORDER BY event_id ASC` rows, err = tx.Query(dbQuery) if err != nil { - log.Printf("Generating status update event list failed: %v\n", err) + log.Printf("Generating status update event list failed: %v", err) tx.Rollback() continue } @@ -3418,7 +3418,7 @@ func StatusUpdatesLoop() { var ev evEntry err = rows.Scan(&ev.eventID, &ev.timeStamp, &ev.dbID, &ev.eType, &ev.details) if err != nil { - log.Printf("Error retrieving event list for status updates thread: %v\n", err) + log.Printf("Error retrieving event list for status updates thread: %v", err) rows.Close() tx.Rollback() continue @@ -3436,7 +3436,7 @@ func StatusUpdatesLoop() { WHERE db_id = $1` rows, err = tx.Query(dbQuery, ev.dbID) if err != nil { - log.Printf("Database query failed: %v\n", err) + log.Printf("Database query failed: %v", err) tx.Rollback() continue } @@ -3445,7 +3445,7 @@ func StatusUpdatesLoop() { var user int64 err = rows.Scan(&user) if err != nil { - log.Printf("Error retrieving user list for status updates thread: %v\n", err) + log.Printf("Error retrieving user list for status updates thread: %v", err) rows.Close() tx.Rollback() continue @@ -3467,7 +3467,7 @@ func StatusUpdatesLoop() { var userName string err = tx.QueryRow(dbQuery, u).Scan(&userName, &eml, &userEvents) if err != nil { - log.Printf("Database query failed: %v\n", err) + log.Printf("Database query failed: %v", err) tx.Rollback() continue } @@ -3518,7 +3518,7 @@ func StatusUpdatesLoop() { continue } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong number of rows affected (%v) when adding status update for database ID "+ + log.Printf("Wrong number of rows affected (%d) when adding status update for database ID "+ "'%d' to user '%v'", numRows, ev.dbID, u) tx.Rollback() continue @@ -3581,7 +3581,7 @@ func StatusUpdatesLoop() { continue } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong number of rows affected (%v) when adding status update to email"+ + log.Printf("Wrong number of rows affected (%d) when adding status update to email"+ "queue for user '%v'", numRows, u) tx.Rollback() continue @@ -3599,7 +3599,7 @@ func StatusUpdatesLoop() { continue } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong number of rows affected (%v) when removing event ID '%d'", numRows, id) + log.Printf("Wrong number of rows affected (%d) when removing event ID '%d'", numRows, id) continue } } @@ -3630,13 +3630,13 @@ func StoreBranches(dbOwner, dbName string, branches map[string]BranchEntry) erro AND db_name = $2` commandTag, err := pdb.Exec(dbQuery, dbOwner, dbName, branches, len(branches)) if err != nil { - log.Printf("Updating branch heads for database '%s/%s' to '%v' failed: %v\n", + log.Printf("Updating branch heads for database '%s/%s' to '%v' failed: %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), branches, err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { log.Printf( - "Wrong number of rows (%v) affected when updating branch heads for database '%s/%s' to '%v'\n", + "Wrong number of rows (%d) affected when updating branch heads for database '%s/%s' to '%v'", numRows, SanitiseLogString(dbOwner), SanitiseLogString(dbName), branches) } return nil @@ -3674,7 +3674,7 @@ func StoreComment(dbOwner, dbName, commenter string, discID int, comText string, AND disc.creator = u.user_id` err = tx.QueryRow(dbQuery, dbOwner, dbName, discID).Scan(&discState, &discCreator, &discType, &discTitle) if err != nil { - log.Printf("Error retrieving current open state for '%s/%s', discussion '%d': %v\n", + log.Printf("Error retrieving current open state for '%s/%s', discussion '%d': %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), discID, err) return err } @@ -3712,7 +3712,7 @@ func StoreComment(dbOwner, dbName, commenter string, discID int, comText string, RETURNING com_id` err = tx.QueryRow(dbQuery, dbOwner, dbName, commenter, discID, comText).Scan(&comID) if err != nil { - log.Printf("Adding comment for database '%s/%s', discussion '%d' failed: %v\n", + log.Printf("Adding comment for database '%s/%s', discussion '%d' failed: %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), discID, err) return err } @@ -3752,13 +3752,13 @@ func StoreComment(dbOwner, dbName, commenter string, discID int, comText string, SELECT (SELECT db_id FROM d), (SELECT int_id FROM int), (SELECT user_id FROM users WHERE lower(user_name) = lower($3)), $5, $6` commandTag, err = tx.Exec(dbQuery, dbOwner, dbName, commenter, discID, eventTxt, eventType) if err != nil { - log.Printf("Adding comment for database '%s/%s', discussion '%d' failed: %v\n", + log.Printf("Adding comment for database '%s/%s', discussion '%d' failed: %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), discID, err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { log.Printf( - "Wrong number of rows (%v) affected when adding a comment to database '%s/%s', discussion '%d'\n", + "Wrong number of rows (%d) affected when adding a comment to database '%s/%s', discussion '%d'", numRows, SanitiseLogString(dbOwner), SanitiseLogString(dbName), discID) } } @@ -3781,13 +3781,13 @@ func StoreComment(dbOwner, dbName, commenter string, discID int, comText string, AND disc_id = $3` commandTag, err = tx.Exec(dbQuery, dbOwner, dbName, discID, mrState) if err != nil { - log.Printf("Updating MR state for database '%s/%s', discussion '%d' failed: %v\n", + log.Printf("Updating MR state for database '%s/%s', discussion '%d' failed: %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), discID, err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { log.Printf( - "Wrong number of rows (%v) affected when updating MR state for database '%s/%s', discussion '%d'\n", + "Wrong number of rows (%d) affected when updating MR state for database '%s/%s', discussion '%d'", numRows, SanitiseLogString(dbOwner), SanitiseLogString(dbName), discID) } } @@ -3822,13 +3822,13 @@ func StoreComment(dbOwner, dbName, commenter string, discID int, comText string, AND disc_id = $3` commandTag, err = tx.Exec(dbQuery, dbOwner, dbName, discID) if err != nil { - log.Printf("Updating last modified date for database '%s/%s', discussion '%d' failed: %v\n", + log.Printf("Updating last modified date for database '%s/%s', discussion '%d' failed: %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), discID, err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { log.Printf( - "Wrong number of rows (%v) affected when updating last_modified date for database '%s/%s', discussion '%d'\n", + "Wrong number of rows (%d) affected when updating last_modified date for database '%s/%s', discussion '%d'", numRows, SanitiseLogString(dbOwner), SanitiseLogString(dbName), discID) } @@ -3862,13 +3862,13 @@ func StoreComment(dbOwner, dbName, commenter string, discID int, comText string, WHERE db_id = (SELECT db_id FROM d)` commandTag, err = tx.Exec(dbQuery, dbOwner, dbName) if err != nil { - log.Printf("Updating discussion count for database '%s/%s' failed: %v\n", SanitiseLogString(dbOwner), + log.Printf("Updating discussion count for database '%s/%s' failed: %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { log.Printf( - "Wrong number of rows (%v) affected when updating discussion count for database '%s/%s'\n", + "Wrong number of rows (%d) affected when updating discussion count for database '%s/%s'", numRows, SanitiseLogString(dbOwner), SanitiseLogString(dbName)) } @@ -3893,7 +3893,7 @@ func StoreComment(dbOwner, dbName, commenter string, discID int, comText string, } err = NewEvent(details) if err != nil { - log.Printf("Error when creating a new event: %s\n", err.Error()) + log.Printf("Error when creating a new event: %s", err.Error()) return err } } @@ -3919,13 +3919,12 @@ func StoreCommits(dbOwner, dbName string, commitList map[string]CommitEntry) err AND db_name = $2` commandTag, err := pdb.Exec(dbQuery, dbOwner, dbName, commitList) if err != nil { - log.Printf("Updating commit list for database '%s/%s' failed: %v\n", SanitiseLogString(dbOwner), + log.Printf("Updating commit list for database '%s/%s' failed: %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf( - "Wrong number of rows (%v) affected when updating commit list for database '%s/%s'\n", numRows, + log.Printf("Wrong number of rows (%d) affected when updating commit list for database '%s/%s'", numRows, SanitiseLogString(dbOwner), SanitiseLogString(dbName)) } return nil @@ -3993,19 +3992,19 @@ func StoreDatabase(dbOwner, dbName string, branches map[string]BranchEntry, c Co cMap, branches) } if err != nil { - log.Printf("Storing database '%s/%s' failed: %v\n", SanitiseLogString(dbOwner), + log.Printf("Storing database '%s/%s' failed: %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong number of rows (%v) affected while storing database '%s/%s'\n", numRows, SanitiseLogString(dbOwner), + log.Printf("Wrong number of rows (%d) affected while storing database '%s/%s'", numRows, SanitiseLogString(dbOwner), SanitiseLogString(dbName)) } if createDefBranch { err = StoreDefaultBranchName(dbOwner, dbName, branchName) if err != nil { - log.Printf("Storing default branch '%s' name for '%s/%s' failed: %v\n", SanitiseLogString(branchName), + log.Printf("Storing default branch '%s' name for '%s/%s' failed: %v", SanitiseLogString(branchName), SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return err } @@ -4026,12 +4025,12 @@ func StoreDefaultBranchName(dbOwner, dbName, branchName string) error { AND db_name = $2` commandTag, err := pdb.Exec(dbQuery, dbOwner, dbName, branchName) if err != nil { - log.Printf("Changing default branch for database '%v' to '%v' failed: %v\n", SanitiseLogString(dbName), + log.Printf("Changing default branch for database '%v' to '%v' failed: %v", SanitiseLogString(dbName), SanitiseLogString(branchName), err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong number of rows (%v) affected during update: database: %v, new branch name: '%v'\n", + log.Printf("Wrong number of rows (%d) affected during update: database: %v, new branch name: '%v'", numRows, SanitiseLogString(dbName), SanitiseLogString(branchName)) } return nil @@ -4055,12 +4054,12 @@ func StoreDefaultTableName(dbOwner, dbName, tableName string) error { AND db_name = $2` commandTag, err := pdb.Exec(dbQuery, dbOwner, dbName, t) if err != nil { - log.Printf("Changing default table for database '%v' to '%v' failed: %v\n", SanitiseLogString(dbName), + log.Printf("Changing default table for database '%v' to '%v' failed: %v", SanitiseLogString(dbName), tableName, err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong number of rows (%v) affected during update: database: %v, new table name: '%v'\n", + log.Printf("Wrong number of rows (%d) affected during update: database: %v, new table name: '%v'", numRows, SanitiseLogString(dbName), tableName) } return nil @@ -4128,7 +4127,7 @@ func StoreDiscussion(dbOwner, dbName, loggedInUser, title, text string, discType err = tx.QueryRow(dbQuery, dbOwner, dbName, loggedInUser, title, text, discType).Scan(&newID) } if err != nil { - log.Printf("Adding new discussion or merge request '%s' for '%s/%s' failed: %v\n", SanitiseLogString(title), + log.Printf("Adding new discussion or merge request '%s' for '%s/%s' failed: %v", SanitiseLogString(title), SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return } @@ -4152,12 +4151,12 @@ func StoreDiscussion(dbOwner, dbName, loggedInUser, title, text string, discType AND db_name = $2` commandTag, err := tx.Exec(dbQuery, dbOwner, dbName) if err != nil { - log.Printf("Updating discussion counter for '%s/%s' failed: %v\n", SanitiseLogString(dbOwner), + log.Printf("Updating discussion counter for '%s/%s' failed: %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong number of rows (%v) affected when updating discussion counter for '%s/%s'\n", + log.Printf("Wrong number of rows (%d) affected when updating discussion counter for '%s/%s'", numRows, SanitiseLogString(dbOwner), SanitiseLogString(dbName)) } @@ -4195,11 +4194,11 @@ func StoreLicence(userName, licenceName string, txt []byte, url string, orderNum commandTag, err := pdb.Exec(dbQuery, userName, licenceName, hex.EncodeToString(sha[:]), txt, url, orderNum, fullName, fileFormat) if err != nil { - log.Printf("Inserting licence '%v' in database failed: %v\n", SanitiseLogString(licenceName), err) + log.Printf("Inserting licence '%v' in database failed: %v", SanitiseLogString(licenceName), err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong number of rows (%v) affected when storing licence '%v'\n", numRows, SanitiseLogString(licenceName)) + log.Printf("Wrong number of rows (%d) affected when storing licence '%v'", numRows, SanitiseLogString(licenceName)) } return nil } @@ -4217,12 +4216,12 @@ func StoreReleases(dbOwner, dbName string, releases map[string]ReleaseEntry) err AND db_name = $2` commandTag, err := pdb.Exec(dbQuery, dbOwner, dbName, releases, len(releases)) if err != nil { - log.Printf("Storing releases for database '%s/%s' failed: %v\n", SanitiseLogString(dbOwner), + log.Printf("Storing releases for database '%s/%s' failed: %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong number of rows (%v) affected when storing releases for database: '%s/%s'\n", numRows, + log.Printf("Wrong number of rows (%d) affected when storing releases for database: '%s/%s'", numRows, SanitiseLogString(dbOwner), SanitiseLogString(dbName)) } return nil @@ -4303,7 +4302,7 @@ func StoreStatusUpdates(userName string, statusUpdates map[string][]StatusUpdate return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong number of rows affected (%v) when storing status update for user '%s'", numRows, + log.Printf("Wrong number of rows affected (%d) when storing status update for user '%s'", numRows, userName) return err } @@ -4323,12 +4322,12 @@ func StoreTags(dbOwner, dbName string, tags map[string]TagEntry) error { AND db_name = $2` commandTag, err := pdb.Exec(dbQuery, dbOwner, dbName, tags, len(tags)) if err != nil { - log.Printf("Storing tags for database '%s/%s' failed: %v\n", SanitiseLogString(dbOwner), + log.Printf("Storing tags for database '%s/%s' failed: %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong number of rows (%v) affected when storing tags for database: '%s/%s'\n", numRows, + log.Printf("Wrong number of rows (%d) affected when storing tags for database: '%s/%s'", numRows, SanitiseLogString(dbOwner), SanitiseLogString(dbName)) } return nil @@ -4362,12 +4361,12 @@ func ToggleDBStar(loggedInUser, dbOwner, dbName string) error { FROM u` commandTag, err := pdb.Exec(insertQuery, dbID, loggedInUser) if err != nil { - log.Printf("Adding star to database failed. Database ID: '%v' Username: '%s' Error '%v'\n", + log.Printf("Adding star to database failed. Database ID: '%v' Username: '%s' Error '%v'", dbID, loggedInUser, err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong # of rows affected (%v) when starring database ID: '%v' Username: '%s'\n", + log.Printf("Wrong # of rows affected (%v) when starring database ID: '%v' Username: '%s'", numRows, dbID, loggedInUser) } } else { @@ -4382,12 +4381,12 @@ func ToggleDBStar(loggedInUser, dbOwner, dbName string) error { )` commandTag, err := pdb.Exec(deleteQuery, dbID, loggedInUser) if err != nil { - log.Printf("Removing star from database failed. Database ID: '%v' Username: '%s' Error: '%v'\n", + log.Printf("Removing star from database failed. Database ID: '%v' Username: '%s' Error: '%v'", dbID, loggedInUser, err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong # of rows (%v) affected when unstarring database ID: '%v' Username: '%s'\n", + log.Printf("Wrong # of rows (%v) affected when unstarring database ID: '%v' Username: '%s'", numRows, dbID, loggedInUser) } } @@ -4402,11 +4401,11 @@ func ToggleDBStar(loggedInUser, dbOwner, dbName string) error { ) WHERE db_id = $1` commandTag, err := pdb.Exec(updateQuery, dbID) if err != nil { - log.Printf("Updating star count in database failed: %v\n", err) + log.Printf("Updating star count in database failed: %v", err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong # of rows affected (%v) when updating star count. Database ID: '%v'\n", numRows, dbID) + log.Printf("Wrong # of rows affected (%v) when updating star count. Database ID: '%v'", numRows, dbID) } return nil } @@ -4443,7 +4442,7 @@ func ToggleDBWatch(loggedInUser, dbOwner, dbName string) error { FROM d, u` commandTag, err := pdb.Exec(insertQuery, dbOwner, dbName, loggedInUser) if err != nil { - log.Printf("Adding '%s' to watchers list for database '%s/%s' failed: Error '%v'\n", loggedInUser, + log.Printf("Adding '%s' to watchers list for database '%s/%s' failed: Error '%v'", loggedInUser, SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return err } @@ -4472,7 +4471,7 @@ func ToggleDBWatch(loggedInUser, dbOwner, dbName string) error { )` commandTag, err := pdb.Exec(deleteQuery, dbOwner, dbName, loggedInUser) if err != nil { - log.Printf("Removing '%s' from watchers list for database '%s/%s' failed: Error '%v'\n", + log.Printf("Removing '%s' from watchers list for database '%s/%s' failed: Error '%v'", loggedInUser, SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return err } @@ -4522,11 +4521,11 @@ func UpdateAvatarURL(userName, avatarURL string) error { WHERE lower(user_name) = lower($1)` commandTag, err := pdb.Exec(dbQuery, userName, avatarURL) if err != nil { - log.Printf("Updating avatar URL failed for user '%s'. Error: '%v'\n", userName, err) + log.Printf("Updating avatar URL failed for user '%s'. Error: '%v'", userName, err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong # of rows (%v) affected when updating avatar URL. User: '%s'\n", numRows, + log.Printf("Wrong # of rows (%v) affected when updating avatar URL. User: '%s'", numRows, userName) } return nil @@ -4559,12 +4558,12 @@ func UpdateContributorsCount(dbOwner, dbName string) error { AND db_name = $2` commandTag, err := pdb.Exec(dbQuery, dbOwner, dbName, n) if err != nil { - log.Printf("Updating contributor count in database '%s/%s' failed: %v\n", SanitiseLogString(dbOwner), + log.Printf("Updating contributor count in database '%s/%s' failed: %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong # of rows affected (%v) when updating contributor count for database '%s/%s'\n", + log.Printf("Wrong # of rows affected (%v) when updating contributor count for database '%s/%s'", numRows, SanitiseLogString(dbOwner), SanitiseLogString(dbName)) } return nil @@ -4606,7 +4605,7 @@ func UpdateComment(dbOwner, dbName, loggedInUser string, discID, comID int, newT AND com.commenter = u.user_id` err = tx.QueryRow(dbQuery, dbOwner, dbName, discID, comID).Scan(&comCreator) if err != nil { - log.Printf("Error retrieving name of comment creator for '%s/%s', discussion '%d', comment '%d': %v\n", + log.Printf("Error retrieving name of comment creator for '%s/%s', discussion '%d', comment '%d': %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), discID, comID, err) return err } @@ -4647,13 +4646,13 @@ func UpdateComment(dbOwner, dbName, loggedInUser string, discID, comID int, newT AND com.com_id = $4` commandTag, err := tx.Exec(dbQuery, dbOwner, dbName, discID, comID, newText) if err != nil { - log.Printf("Updating comment for database '%s/%s', discussion '%d', comment '%d' failed: %v\n", + log.Printf("Updating comment for database '%s/%s', discussion '%d', comment '%d' failed: %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), discID, comID, err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { log.Printf( - "Wrong number of rows (%v) affected when updating comment for database '%s/%s', discussion '%d', comment '%d'\n", + "Wrong number of rows (%d) affected when updating comment for database '%s/%s', discussion '%d', comment '%d'", numRows, SanitiseLogString(dbOwner), SanitiseLogString(dbName), discID, comID) } @@ -4694,7 +4693,7 @@ func UpdateDiscussion(dbOwner, dbName, loggedInUser string, discID int, newTitle AND disc.creator = u.user_id` err = tx.QueryRow(dbQuery, dbOwner, dbName, discID).Scan(&discCreator) if err != nil { - log.Printf("Error retrieving name of discussion creator for '%s/%s', discussion '%d': %v\n", + log.Printf("Error retrieving name of discussion creator for '%s/%s', discussion '%d': %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), discID, err) return err } @@ -4729,13 +4728,13 @@ func UpdateDiscussion(dbOwner, dbName, loggedInUser string, discID int, newTitle AND disc.disc_id = $3` commandTag, err := tx.Exec(dbQuery, dbOwner, dbName, discID, newTitle, newText) if err != nil { - log.Printf("Updating discussion for database '%s/%s', discussion '%d' failed: %v\n", SanitiseLogString(dbOwner), + log.Printf("Updating discussion for database '%s/%s', discussion '%d' failed: %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), discID, err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { log.Printf( - "Wrong number of rows (%v) affected when updating discussion for database '%s/%s', discussion '%d'\n", + "Wrong number of rows (%d) affected when updating discussion for database '%s/%s', discussion '%d'", numRows, SanitiseLogString(dbOwner), SanitiseLogString(dbName), discID) } @@ -4766,13 +4765,12 @@ func UpdateMergeRequestCommits(dbOwner, dbName string, discID int, mrCommits []C AND disc.disc_id = $3` commandTag, err := pdb.Exec(dbQuery, dbOwner, dbName, discID, mrCommits) if err != nil { - log.Printf("Updating commit list for database '%s/%s', MR '%d' failed: %v\n", dbOwner, + log.Printf("Updating commit list for database '%s/%s', MR '%d' failed: %v", dbOwner, dbName, discID, err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf( - "Wrong number of rows (%v) affected when updating commit list for database '%s/%s', MR '%d'\n", + log.Printf("Wrong number of rows (%d) affected when updating commit list for database '%s/%s', MR '%d'", numRows, dbOwner, dbName, discID) } return nil @@ -4794,7 +4792,7 @@ func User(userName string) (user UserDetails, err error) { } // A real occurred - log.Printf("Error retrieving details for user '%s' from database: %v\n", SanitiseLogString(userName), err) + log.Printf("Error retrieving details for user '%s' from database: %v", SanitiseLogString(userName), err) return user, nil } @@ -4863,7 +4861,7 @@ func UserDBs(userName string, public AccessType) (list []DBInfo, err error) { &oneRow.Releases, &oneRow.Tags, &oneRow.Contributors, &desc, &oneRow.CommitID, &oneRow.DBEntry, &source, &defBranch, &oneRow.Downloads, &oneRow.Views) if err != nil { - log.Printf("Error retrieving database list for user: %v\n", err) + log.Printf("Error retrieving database list for user: %v", err) return nil, err } if defBranch.Valid { @@ -4910,7 +4908,7 @@ func UserDBs(userName string, public AccessType) (list []DBInfo, err error) { AND db_name = $2)` err = pdb.QueryRow(dbQuery, userName, j.Database).Scan(&list[i].Forks) if err != nil { - log.Printf("Error retrieving fork count for '%s/%s': %v\n", SanitiseLogString(userName), + log.Printf("Error retrieving fork count for '%s/%s': %v", SanitiseLogString(userName), j.Database, err) return nil, err } @@ -4934,7 +4932,7 @@ func UserNameFromAuth0ID(auth0id string) (string, error) { } // A real occurred - log.Printf("Error looking up username in database: %v\n", err) + log.Printf("Error looking up username in database: %v", err) return "", nil } @@ -4966,7 +4964,7 @@ func UserStarredDBs(userName string) (list []DBEntry, err error) { ORDER BY date_starred DESC` rows, err := pdb.Query(dbQuery, userName) if err != nil { - log.Printf("Database query failed: %v\n", err) + log.Printf("Database query failed: %v", err) return nil, err } defer rows.Close() @@ -4974,7 +4972,7 @@ func UserStarredDBs(userName string) (list []DBEntry, err error) { var oneRow DBEntry err = rows.Scan(&oneRow.Owner, &oneRow.DBName, &oneRow.DateEntry) if err != nil { - log.Printf("Error retrieving stars list for user: %v\n", err) + log.Printf("Error retrieving stars list for user: %v", err) return nil, err } list = append(list, oneRow) @@ -5007,7 +5005,7 @@ func UsersStarredDB(dbOwner, dbName string) (list []DBEntry, err error) { ORDER BY star_users.date_starred DESC` rows, err := pdb.Query(dbQuery, dbOwner, dbName) if err != nil { - log.Printf("Database query failed: %v\n", err) + log.Printf("Database query failed: %v", err) return nil, err } defer rows.Close() @@ -5016,7 +5014,7 @@ func UsersStarredDB(dbOwner, dbName string) (list []DBEntry, err error) { var dn pgx.NullString err = rows.Scan(&oneRow.Owner, &dn, &oneRow.DateEntry) if err != nil { - log.Printf("Error retrieving list of stars for %s/%s: %v\n", dbOwner, dbName, err) + log.Printf("Error retrieving list of stars for %s/%s: %v", dbOwner, dbName, err) return nil, err } @@ -5055,7 +5053,7 @@ func UsersWatchingDB(dbOwner, dbName string) (list []DBEntry, err error) { ORDER BY lst.date_watched DESC` rows, err := pdb.Query(dbQuery, dbOwner, dbName) if err != nil { - log.Printf("Database query failed: %v\n", err) + log.Printf("Database query failed: %v", err) return nil, err } defer rows.Close() @@ -5064,7 +5062,7 @@ func UsersWatchingDB(dbOwner, dbName string) (list []DBEntry, err error) { var dn pgx.NullString err = rows.Scan(&oneRow.Owner, &dn, &oneRow.DateEntry) if err != nil { - log.Printf("Error retrieving list of watchers for %s/%s: %v\n", dbOwner, dbName, err) + log.Printf("Error retrieving list of watchers for %s/%s: %v", dbOwner, dbName, err) return nil, err } @@ -5104,7 +5102,7 @@ func UserWatchingDBs(userName string) (list []DBEntry, err error) { ORDER BY date_watched DESC` rows, err := pdb.Query(dbQuery, userName) if err != nil { - log.Printf("Database query failed: %v\n", err) + log.Printf("Database query failed: %v", err) return nil, err } defer rows.Close() @@ -5112,7 +5110,7 @@ func UserWatchingDBs(userName string) (list []DBEntry, err error) { var oneRow DBEntry err = rows.Scan(&oneRow.Owner, &oneRow.DBName, &oneRow.DateEntry) if err != nil { - log.Printf("Error retrieving database watch list for user: %v\n", err) + log.Printf("Error retrieving database watch list for user: %v", err) return nil, err } list = append(list, oneRow) @@ -5134,7 +5132,7 @@ func ViewCount(dbOwner, dbName string) (viewCount int, err error) { AND db_name = $2` err = pdb.QueryRow(dbQuery, dbOwner, dbName).Scan(&viewCount) if err != nil { - log.Printf("Retrieving view count for '%s/%s' failed: %v\n", SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) + log.Printf("Retrieving view count for '%s/%s' failed: %v", SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return 0, err } return @@ -5157,11 +5155,13 @@ func VisualisationDeleteParams(dbOwner, dbName, visName string) (err error) { DELETE FROM vis_params WHERE user_id = (SELECT user_id FROM u) AND db_id = (SELECT db_id FROM d) AND name = $3` commandTag, err = pdb.Exec(dbQuery, dbOwner, dbName, visName) if err != nil { - log.Printf("Deleting visualisation '%s' for database '%s/%s' failed: %v\n", SanitiseLogString(visName), SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) + log.Printf("Deleting visualisation '%s' for database '%s/%s' failed: %v", SanitiseLogString(visName), + SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong number of rows (%v) affected while deleting visualisation '%s' for database '%s/%s'\n", numRows, SanitiseLogString(visName), SanitiseLogString(dbOwner), SanitiseLogString(dbName)) + log.Printf("Wrong number of rows (%d) affected while deleting visualisation '%s' for database '%s/%s'", + numRows, SanitiseLogString(visName), SanitiseLogString(dbOwner), SanitiseLogString(dbName)) } return } @@ -5187,11 +5187,13 @@ func VisualisationSaveData(dbOwner, dbName, commitID, hash string, visData []Vis SET results = $5` commandTag, err = pdb.Exec(dbQuery, dbOwner, dbName, commitID, hash, visData) if err != nil { - log.Printf("Saving visualisation data for database '%s/%s', commit '%s', hash '%s' failed: %v\n", dbOwner, dbName, commitID, hash, err) + log.Printf("Saving visualisation data for database '%s/%s', commit '%s', hash '%s' failed: %v", dbOwner, + dbName, commitID, hash, err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong number of rows (%v) affected while saving visualisation data for database '%s/%s', commit '%s', hash '%s'\n", numRows, dbOwner, dbName, commitID, hash) + log.Printf("Wrong number of rows (%d) affected while saving visualisation data for database '%s/%s', commit '%s', hash '%s'", + numRows, dbOwner, dbName, commitID, hash) } return } @@ -5217,11 +5219,13 @@ func VisualisationSaveParams(dbOwner, dbName, visName string, visParams VisParam SET parameters = $4` commandTag, err = pdb.Exec(dbQuery, dbOwner, dbName, visName, visParams) if err != nil { - log.Printf("Saving visualisation '%s' for database '%s/%s' failed: %v\n", SanitiseLogString(visName), SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) + log.Printf("Saving visualisation '%s' for database '%s/%s' failed: %v", SanitiseLogString(visName), + SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return err } if numRows := commandTag.RowsAffected(); numRows != 1 { - log.Printf("Wrong number of rows (%v) affected while saving visualisation '%s' for database '%s/%s'\n", numRows, SanitiseLogString(visName), SanitiseLogString(dbOwner), SanitiseLogString(dbName)) + log.Printf("Wrong number of rows (%d) affected while saving visualisation '%s' for database '%s/%s'", + numRows, SanitiseLogString(visName), SanitiseLogString(dbOwner), SanitiseLogString(dbName)) } return } diff --git a/common/responses.go b/common/responses.go index 221ab82f3..c8e510cc3 100644 --- a/common/responses.go +++ b/common/responses.go @@ -112,7 +112,7 @@ func UploadResponse(w http.ResponseWriter, r *http.Request, loggedInUser, target var handler *multipart.FileHeader tempFile, handler, err = r.FormFile("file") if err != nil && err.Error() != "http: no such file" { - log.Printf("Uploading file failed: %v\n", err) + log.Printf("Uploading file failed: %v", err) httpStatus = http.StatusBadRequest err = fmt.Errorf("Something went wrong when grabbing the file data: '%s'", err.Error()) return @@ -122,7 +122,7 @@ func UploadResponse(w http.ResponseWriter, r *http.Request, loggedInUser, target // Check for a 'file1' FormFile too, as some clients can't use 'file' (without a number) due to a design bug tempFile, handler, err = r.FormFile("file1") if err != nil { - log.Printf("Uploading file failed: %v\n", err) + log.Printf("Uploading file failed: %v", err) httpStatus = http.StatusBadRequest err = fmt.Errorf("Something went wrong when grabbing the file data: '%s'", err.Error()) return diff --git a/common/sqlite.go b/common/sqlite.go index 3ff309c1f..b17937e37 100644 --- a/common/sqlite.go +++ b/common/sqlite.go @@ -263,7 +263,7 @@ func GetSQLiteRowCount(sdb *sqlite.Conn, dbTable string) (rowCount int, err erro dbQuery := `SELECT count(*) FROM "` + dbTable + `"` err = sdb.OneValue(dbQuery, &rowCount) if err != nil { - log.Printf("Error occurred when counting total rows for table '%s'. Error: %s\n", SanitiseLogString(dbTable), err) + log.Printf("Error occurred when counting total rows for table '%s'. Error: %s", SanitiseLogString(dbTable), err) return 0, errors.New("Database query failure") } return @@ -288,7 +288,7 @@ func OpenSQLiteDatabase(bucket, id string) (sdb *sqlite.Conn, err error) { } err = sdb.EnableExtendedResultCodes(true) if err != nil { - log.Printf("Couldn't enable extended result codes! Error: %v\n", err.Error()) + log.Printf("Couldn't enable extended result codes! Error: %v", err.Error()) return } return @@ -331,7 +331,7 @@ func OpenSQLiteDatabaseDefensive(w http.ResponseWriter, r *http.Request, dbOwner return nil, err } if err = sdb.EnableExtendedResultCodes(true); err != nil { - log.Printf("Couldn't enable extended result codes! Error: %v\n", err.Error()) + log.Printf("Couldn't enable extended result codes! Error: %v", err.Error()) w.WriteHeader(http.StatusInternalServerError) fmt.Fprintf(w, "%s", err.Error()) return nil, err @@ -340,7 +340,7 @@ func OpenSQLiteDatabaseDefensive(w http.ResponseWriter, r *http.Request, dbOwner // Enable the defensive flag var enabled bool if enabled, err = sdb.EnableDefensive(true); !enabled || err != nil { - log.Printf("Couldn't enable the defensive flag: %v\n", err) + log.Printf("Couldn't enable the defensive flag: %v", err) w.WriteHeader(http.StatusInternalServerError) fmt.Fprintf(w, "%s", err.Error()) return nil, err @@ -348,7 +348,7 @@ func OpenSQLiteDatabaseDefensive(w http.ResponseWriter, r *http.Request, dbOwner // Verify the defensive flag was enabled if enabled, err = sdb.IsDefensiveEnabled(); !enabled || err != nil { - log.Printf("The defensive flag wasn't enabled after all: %v\n", err) + log.Printf("The defensive flag wasn't enabled after all: %v", err) w.WriteHeader(http.StatusInternalServerError) fmt.Fprintf(w, "%s", err.Error()) return nil, err @@ -356,7 +356,7 @@ func OpenSQLiteDatabaseDefensive(w http.ResponseWriter, r *http.Request, dbOwner // Turn off the trusted schema flag if enabled, err = sdb.EnableTrustedSchema(false); enabled || err != nil { - log.Printf("Couldn't disable the trusted schema flag: %v\n", err) + log.Printf("Couldn't disable the trusted schema flag: %v", err) w.WriteHeader(http.StatusInternalServerError) fmt.Fprintf(w, "%s", err.Error()) return nil, err @@ -364,7 +364,7 @@ func OpenSQLiteDatabaseDefensive(w http.ResponseWriter, r *http.Request, dbOwner // Verify the trusted schema flag was turned off if enabled, err = sdb.IsTrustedSchema(); enabled || err != nil { - log.Printf("The trusted schema flag wasn't disabled after all: %v\n", err) + log.Printf("The trusted schema flag wasn't disabled after all: %v", err) w.WriteHeader(http.StatusInternalServerError) fmt.Fprintf(w, "%s", err.Error()) return nil, err @@ -463,7 +463,7 @@ func OpenSQLiteDatabaseDefensive(w http.ResponseWriter, r *http.Request, dbOwner // Check for a failure if !ok || err != nil { - log.Printf("Error when disabling mmap on the LIVE database: %s\n", err) + log.Printf("Error when disabling mmap on the LIVE database: %s", err) return } @@ -513,32 +513,32 @@ func OpenSQLiteDatabaseLive(baseDir, dbOwner, dbName string) (sdb *sqlite.Conn, return } if err = sdb.EnableExtendedResultCodes(true); err != nil { - log.Printf("Couldn't enable extended result codes for LIVE database query! Error: %v\n", err.Error()) + log.Printf("Couldn't enable extended result codes for LIVE database query! Error: %v", err.Error()) return } // Enable the defensive flag var enabled bool if enabled, err = sdb.EnableDefensive(true); !enabled || err != nil { - log.Printf("Couldn't enable the defensive flag for LIVE database query: %v\n", err) + log.Printf("Couldn't enable the defensive flag for LIVE database query: %v", err) return } // Verify the defensive flag was enabled if enabled, err = sdb.IsDefensiveEnabled(); !enabled || err != nil { - log.Printf("The defensive flag wasn't enabled for LIVE database query after all: %v\n", err) + log.Printf("The defensive flag wasn't enabled for LIVE database query after all: %v", err) return } // Turn off the trusted schema flag if enabled, err = sdb.EnableTrustedSchema(false); enabled || err != nil { - log.Printf("Couldn't disable the trusted schema flag for LIVE database query: %v\n", err) + log.Printf("Couldn't disable the trusted schema flag for LIVE database query: %v", err) return } // Verify the trusted schema flag was turned off if enabled, err = sdb.IsTrustedSchema(); enabled || err != nil { - log.Printf("The trusted schema flag wasn't disabled for LIVE database query after all: %v\n", err) + log.Printf("The trusted schema flag wasn't disabled for LIVE database query after all: %v", err) return } @@ -633,7 +633,7 @@ func OpenSQLiteDatabaseLive(baseDir, dbOwner, dbName string) (sdb *sqlite.Conn, // Check for a failure if !ok || err != nil { - log.Printf("Error when disabling mmap on the LIVE database: %s\n", err) + log.Printf("Error when disabling mmap on the LIVE database: %s", err) return } @@ -713,7 +713,7 @@ func ReadSQLiteDBCols(sdb *sqlite.Conn, dbTable, sortCol, sortDir string, ignore dbQuery += sqlite.Mprintf(" (`%s`)", sortCol) err = sdb.Exec(dbQuery) if err != nil { - log.Printf("Error occurred when creating index: %s\n", err.Error()) + log.Printf("Error occurred when creating index: %s", err.Error()) return SQLiteRecordSet{}, err } sdb.Commit() @@ -723,7 +723,7 @@ func ReadSQLiteDBCols(sdb *sqlite.Conn, dbTable, sortCol, sortDir string, ignore // Get information on the primary key of the table pk, _, _, err := GetPrimaryKeyAndOtherColumns(sdb, "main", dbTable) if err != nil { - log.Printf("error retrieving primary key columns: %s\n", err.Error()) + log.Printf("error retrieving primary key columns: %s", err.Error()) return SQLiteRecordSet{}, err } @@ -789,7 +789,7 @@ func ReadSQLiteDBCSV(sdb *sqlite.Conn, dbTable string) ([][]string, error) { // Retrieve all the data from the selected database table stmt, err := sdb.Prepare(`SELECT * FROM "` + dbTable + `"`) if err != nil { - log.Printf("Error when preparing statement for database: %s\n", err) + log.Printf("Error when preparing statement for database: %s", err) return nil, err } @@ -815,7 +815,7 @@ func ReadSQLiteDBCSV(sdb *sqlite.Conn, dbTable string) ([][]string, error) { var val int val, isNull, err = s.ScanInt(i) if err != nil { - log.Printf("Something went wrong with ScanInt(): %v\n", err) + log.Printf("Something went wrong with ScanInt(): %v", err) break } if !isNull { @@ -825,7 +825,7 @@ func ReadSQLiteDBCSV(sdb *sqlite.Conn, dbTable string) ([][]string, error) { var val float64 val, isNull, err = s.ScanDouble(i) if err != nil { - log.Printf("Something went wrong with ScanDouble(): %v\n", err) + log.Printf("Something went wrong with ScanDouble(): %v", err) break } if !isNull { @@ -856,7 +856,7 @@ func ReadSQLiteDBCSV(sdb *sqlite.Conn, dbTable string) ([][]string, error) { return nil }) if err != nil { - log.Printf("Error when reading data from database: %s\n", err) + log.Printf("Error when reading data from database: %s", err) return nil, err } defer stmt.Finalize() @@ -882,7 +882,7 @@ func SQLiteBackupLive(baseDir, dbOwner, dbName string) (err error) { return } if err = sdb.EnableExtendedResultCodes(true); err != nil { - log.Printf("Couldn't enable extended result codes for LIVE database query! Error: %v\n", err.Error()) + log.Printf("Couldn't enable extended result codes for LIVE database query! Error: %v", err.Error()) return } defer sdb.Close() @@ -968,7 +968,7 @@ func SQLiteExecuteQueryLive(baseDir, dbOwner, dbName, loggedInUser, query string // Execute the statement rowsChanged, err = sdb.ExecDml(query) if err != nil { - log.Printf("Error when executing query by '%s' for LIVE database (%s/%s): '%s'\n", + log.Printf("Error when executing query by '%s' for LIVE database (%s/%s): '%s'", SanitiseLogString(loggedInUser), SanitiseLogString(dbOwner), SanitiseLogString(dbName), SanitiseLogString(err.Error())) return @@ -1129,10 +1129,10 @@ func SQLiteSanityCheck(fileName string) (tables []string, err error) { // Check for a failure if !ok || err != nil { - log.Printf("Error when running an integrity check on the database: %s\n", err) + log.Printf("Error when running an integrity check on the database: %s", err) if len(results) > 0 { for _, b := range results { - log.Printf(" * %v\n", b) + log.Printf(" * %v", b) } } return @@ -1229,7 +1229,7 @@ func SQLiteReadDatabasePage(bucket, id, loggedInUser, dbOwner, dbName, dbTable, var colList []sqlite.Column colList, err = sdb.Columns("", dbTable) if err != nil { - log.Printf("Error when reading column names for table '%s': %v\n", SanitiseLogString(dbTable), err.Error()) + log.Printf("Error when reading column names for table '%s': %v", SanitiseLogString(dbTable), err.Error()) return } colExists := false @@ -1318,7 +1318,7 @@ func SQLiteRunQuery(sdb *sqlite.Conn, querySource QuerySource, dbQuery string, i var val int64 val, isNull, err = s.ScanInt64(i) if err != nil { - log.Printf("Something went wrong with ScanInt64(): %v\n", err) + log.Printf("Something went wrong with ScanInt64(): %v", err) break } if !isNull { @@ -1329,7 +1329,7 @@ func SQLiteRunQuery(sdb *sqlite.Conn, querySource QuerySource, dbQuery string, i var val float64 val, isNull, err = s.ScanDouble(i) if err != nil { - log.Printf("Something went wrong with ScanDouble(): %v\n", err) + log.Printf("Something went wrong with ScanDouble(): %v", err) break } if !isNull { @@ -1394,7 +1394,7 @@ func SQLiteRunQuery(sdb *sqlite.Conn, querySource QuerySource, dbQuery string, i return nil }) if err != nil { - log.Printf("Error when retrieving select data from database: %s\n", err) + log.Printf("Error when retrieving select data from database: %s", err) return 0, 0, dataRows, errors.New("Error when reading data from the SQLite database") } @@ -1444,7 +1444,7 @@ func SQLiteRunQueryDefensive(w http.ResponseWriter, r *http.Request, querySource var memUsed, memHighWater int64 memUsed, memHighWater, dataRows, err = SQLiteRunQuery(sdb, querySource, query, false, false) if err != nil { - log.Printf("Error when preparing statement by '%s' for database (%s/%s): '%s'\n", SanitiseLogString(loggedInUser), + log.Printf("Error when preparing statement by '%s' for database (%s/%s): '%s'", SanitiseLogString(loggedInUser), SanitiseLogString(dbOwner), SanitiseLogString(dbName), SanitiseLogString(err.Error())) return SQLiteRecordSet{}, err } @@ -1473,7 +1473,7 @@ func SQLiteRunQueryLive(baseDir, dbOwner, dbName, loggedInUser, query string) (r // Execute the SQLite select query (or queries) _, _, records, err = SQLiteRunQuery(sdb, QuerySourceAPI, query, false, false) if err != nil { - log.Printf("Error when preparing statement by '%s' for LIVE database (%s/%s): '%s'\n", SanitiseLogString(loggedInUser), + log.Printf("Error when preparing statement by '%s' for LIVE database (%s/%s): '%s'", SanitiseLogString(loggedInUser), SanitiseLogString(dbOwner), SanitiseLogString(dbName), SanitiseLogString(err.Error())) return SQLiteRecordSet{}, err } @@ -1546,14 +1546,14 @@ func Views(sdb *sqlite.Conn) (vw []string, err error) { // Retrieve the list of views in the database vw, err = sdb.Views("") if err != nil { - log.Printf("Error retrieving view names: %v\n", err) + log.Printf("Error retrieving view names: %v", err) if cerr, ok := err.(sqlite.ConnError); ok { - log.Printf("Error code: %v\n", cerr.Code()) - log.Printf("Extended error code: %v\n", cerr.ExtendedCode()) - log.Printf("Extended error message: %v\n", cerr.Error()) - log.Printf("Extended error filename: %v\n", cerr.Filename()) + log.Printf("Error code: %v", cerr.Code()) + log.Printf("Extended error code: %v", cerr.ExtendedCode()) + log.Printf("Extended error message: %v", cerr.Error()) + log.Printf("Extended error filename: %v", cerr.Filename()) } else { - log.Printf("Expected a connection error, but got a '%v'\n", reflect.TypeOf(cerr)) + log.Printf("Expected a connection error, but got a '%v'", reflect.TypeOf(cerr)) } return } @@ -1605,7 +1605,7 @@ func GetPrimaryKeyAndOtherColumns(sdb *sqlite.Conn, schema, table string) (pks [ var stmt *sqlite.Stmt stmt, err = sdb.Prepare("PRAGMA " + EscapeId(schema) + ".table_info(" + EscapeId(table) + ")") if err != nil { - log.Printf("Error when preparing statement in GetPrimaryKeyAndOtherColumns(): %s\n", err) + log.Printf("Error when preparing statement in GetPrimaryKeyAndOtherColumns(): %s", err) return nil, false, nil, err } defer stmt.Finalize() @@ -1638,7 +1638,7 @@ func GetPrimaryKeyAndOtherColumns(sdb *sqlite.Conn, schema, table string) (pks [ return nil }) if err != nil { - log.Printf("Error when retrieving rows in GetPrimaryKeyAndOtherColumns(): %s\n", err) + log.Printf("Error when retrieving rows in GetPrimaryKeyAndOtherColumns(): %s", err) return nil, false, nil, err } @@ -1668,10 +1668,10 @@ func GetPrimaryKeyAndOtherColumns(sdb *sqlite.Conn, schema, table string) (pks [ } else { // Implicit primary key - // Views do not even have have implicit keys + // Views do not even have implicit keys vws, err := Views(sdb) if err != nil { - log.Printf("Error retrieving views: %s\n", err) + log.Printf("Error retrieving views: %s", err) return nil, false, nil, err } @@ -1693,7 +1693,7 @@ func GetPrimaryKeyAndOtherColumns(sdb *sqlite.Conn, schema, table string) (pks [ } else if !hasColumnOid { pks = append(pks, "oid") } else { - log.Printf("Unreachable rowid column in GetPrimaryKey()\n") + log.Println("Unreachable rowid column in GetPrimaryKey()") return nil, false, nil, errors.New("Unreachable rowid column") } } diff --git a/common/userinput.go b/common/userinput.go index ca7c812b2..477a5f492 100644 --- a/common/userinput.go +++ b/common/userinput.go @@ -327,7 +327,7 @@ func GetOD(ignoreLeading int, r *http.Request) (dbOwner string, dbName string, e // Check that at least an owner/database combination was requested if len(pathStrings) < (3 + ignoreLeading) { - log.Printf("Something wrong with the requested URL: %v\n", SanitiseLogString(r.URL.Path)) + log.Printf("Something wrong with the requested URL: %v", SanitiseLogString(r.URL.Path)) return "", "", errors.New("Invalid URL") } dbOwner = pathStrings[1+ignoreLeading] @@ -421,7 +421,7 @@ func GetPub(r *http.Request) (public bool, err error) { } public, err = strconv.ParseBool(p) if err != nil { - log.Printf("Error when converting public value to boolean: %v\n", err) + log.Printf("Error when converting public value to boolean: %v", err) return false, err } diff --git a/common/util.go b/common/util.go index e1687883d..57bca329c 100644 --- a/common/util.go +++ b/common/util.go @@ -310,7 +310,7 @@ func AddDatabase(loggedInUser, dbOwner, dbName string, createBranch bool, branch commitCount++ c2, ok = commitList[c2.Parent] if !ok { - m := fmt.Sprintf("Error when counting commits in branch '%s' of database '%s/%s'\n", branchName, + m := fmt.Sprintf("Error when counting commits in branch '%s' of database '%s/%s'", branchName, dbOwner, dbName) log.Print(SanitiseLogString(m)) return 0, "", "", errors.New(m) @@ -322,7 +322,7 @@ func AddDatabase(loggedInUser, dbOwner, dbName string, createBranch bool, branch var newOffset int64 newOffset, err = tempDB.Seek(0, 0) if err != nil { - log.Printf("Seeking on the temporary file (2nd time) failed: %v\n", err.Error()) + log.Printf("Seeking on the temporary file (2nd time) failed: %v", err.Error()) return } if newOffset != 0 { @@ -391,7 +391,7 @@ func AddDatabase(loggedInUser, dbOwner, dbName string, createBranch bool, branch err = InvalidateCacheEntry(loggedInUser, dbOwner, dbName, "") // Empty string indicates "for all versions" if err != nil { // Something went wrong when invalidating memcached entries for the database - log.Printf("Error when invalidating memcache entries: %s\n", err.Error()) + log.Printf("Error when invalidating memcache entries: %s", err.Error()) return } @@ -399,7 +399,7 @@ func AddDatabase(loggedInUser, dbOwner, dbName string, createBranch bool, branch err = InvalidateCacheEntry(loggedInUser, dbOwner, dbName, c.ID) // An empty string indicates "for all commits" if err != nil { // Something went wrong when invalidating memcached entries for any previous database - log.Printf("Error when invalidating memcache entries: %s\n", err.Error()) + log.Printf("Error when invalidating memcache entries: %s", err.Error()) return } @@ -533,7 +533,7 @@ func DeleteBranchHistory(dbOwner, dbName, branchName, commitID string) (isolated c, ok = commitList[c.Parent] if !ok { err = fmt.Errorf("Broken commit history encountered for branch '%s' in '%s/%s', when looking for "+ - "commit '%s'\n", branchName, dbOwner, dbName, c.Parent) + "commit '%s'", branchName, dbOwner, dbName, c.Parent) log.Printf(err.Error()) return } @@ -597,7 +597,7 @@ func DeleteBranchHistory(dbOwner, dbName, branchName, commitID string) (isolated c, ok = commitList[bEntry.Commit] if !ok { err = fmt.Errorf("Broken commit history encountered when checking for isolated tags while "+ - "deleting commits in branch '%s' of database '%s/%s'\n", branchName, dbOwner, dbName) + "deleting commits in branch '%s' of database '%s/%s'", branchName, dbOwner, dbName) log.Print(err.Error()) // Broken commit history is pretty serious, so we log it for admin investigation return } @@ -613,7 +613,7 @@ func DeleteBranchHistory(dbOwner, dbName, branchName, commitID string) (isolated c, ok = commitList[c.Parent] if !ok { err = fmt.Errorf("Broken commit history encountered when checking for isolated tags "+ - "while deleting commits in branch '%s' of database '%s/%s'\n", branchName, dbOwner, + "while deleting commits in branch '%s' of database '%s/%s'", branchName, dbOwner, dbName) log.Print(err.Error()) // Broken commit history is pretty serious, so we log it for admin investigation return @@ -650,7 +650,7 @@ func DeleteBranchHistory(dbOwner, dbName, branchName, commitID string) (isolated c, ok = commitList[bEntry.Commit] if !ok { err = fmt.Errorf("Broken commit history encountered when checking for isolated releases "+ - "while deleting commits in branch '%s' of database '%s/%s'\n", branchName, dbOwner, + "while deleting commits in branch '%s' of database '%s/%s'", branchName, dbOwner, dbName) log.Print(err.Error()) // Broken commit history is pretty serious, so we log it for admin investigation return @@ -667,7 +667,7 @@ func DeleteBranchHistory(dbOwner, dbName, branchName, commitID string) (isolated c, ok = commitList[c.Parent] if !ok { err = fmt.Errorf("Broken commit history encountered when checking for isolated releases "+ - "while deleting commits in branch '%s' of database '%s/%s'\n", branchName, dbOwner, + "while deleting commits in branch '%s' of database '%s/%s'", branchName, dbOwner, dbName) log.Print(err.Error()) // Broken commit history is pretty serious, so we log it for admin investigation return @@ -713,7 +713,7 @@ func DeleteBranchHistory(dbOwner, dbName, branchName, commitID string) (isolated c, ok = commitList[bEntry.Commit] if !ok { err = fmt.Errorf("Broken commit history encountered when checking for commits to remove in "+ - "branch '%s' of database '%s/%s'\n", branchName, dbOwner, dbName) + "branch '%s' of database '%s/%s'", branchName, dbOwner, dbName) log.Print(err.Error()) // Broken commit history is pretty serious, so we log it for admin investigation return } @@ -725,7 +725,7 @@ func DeleteBranchHistory(dbOwner, dbName, branchName, commitID string) (isolated c, ok = commitList[c.Parent] if !ok { err = fmt.Errorf("Broken commit history encountered when checking for commits to remove "+ - "in branch '%s' of database '%s/%s'\n", branchName, dbOwner, dbName) + "in branch '%s' of database '%s/%s'", branchName, dbOwner, dbName) log.Print(err.Error()) // Broken commit history is pretty serious, so we log it for admin investigation return } @@ -744,7 +744,7 @@ func DeleteBranchHistory(dbOwner, dbName, branchName, commitID string) (isolated commitCount++ c, ok = commitList[c.Parent] if !ok { - log.Printf("Error when counting # of commits while rewriting branch '%s' of database '%s/%s'\n", + log.Printf("Error when counting # of commits while rewriting branch '%s' of database '%s/%s'", SanitiseLogString(branchName), SanitiseLogString(dbOwner), SanitiseLogString(dbName)) err = fmt.Errorf("Error when counting commits during branch history rewrite") return @@ -971,7 +971,7 @@ func DownloadDatabase(w http.ResponseWriter, r *http.Request, dbOwner, dbName, c w.Header().Set("Content-Type", "application/x-sqlite3") bytesWritten, err = io.Copy(w, userDB) if err != nil { - log.Printf("Error returning DB file: %v\n", err) + log.Printf("Error returning DB file: %v", err) return } @@ -1028,7 +1028,7 @@ func IsCommitInBranchHistory(dbOwner, dbName, branchName, commitID string) (bool c, ok = commitList[c.Parent] if !ok { log.Printf("Broken commit history encountered for branch '%s' in '%s/%s', when looking for "+ - "commit '%s'\n", SanitiseLogString(branchName), SanitiseLogString(dbOwner), SanitiseLogString(dbName), c.Parent) + "commit '%s'", SanitiseLogString(branchName), SanitiseLogString(dbOwner), SanitiseLogString(dbName), c.Parent) return false, fmt.Errorf("Broken commit history encountered for branch '%s' when looking up "+ "commit details", branchName) } @@ -1159,7 +1159,7 @@ func WriteDBtoDisk(loggedInUser, dbOwner, dbName string, newDB io.Reader) (numBy // Create a temporary file to store the database in tempDB, err = os.CreateTemp(Conf.DiskCache.Directory, "dbhub-upload-") if err != nil { - log.Printf("Error creating temporary file. User: '%s', Database: '%s/%s', Error: %v\n", loggedInUser, + log.Printf("Error creating temporary file. User: '%s', Database: '%s/%s', Error: %v", loggedInUser, SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return } @@ -1171,7 +1171,7 @@ func WriteDBtoDisk(loggedInUser, dbOwner, dbName string, newDB io.Reader) (numBy numBytes, err = io.CopyBuffer(tempDB, newDB, buf) if err != nil { log.Printf("Error when writing the uploaded db to a temp file. User: '%s', Database: '%s/%s' "+ - "Error: %v\n", loggedInUser, SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) + "Error: %v", loggedInUser, SanitiseLogString(dbOwner), SanitiseLogString(dbName), err) return } if numBytes == 0 { @@ -1189,7 +1189,7 @@ func WriteDBtoDisk(loggedInUser, dbOwner, dbName string, newDB io.Reader) (numBy var newOffSet int64 newOffSet, err = tempDB.Seek(0, 0) if err != nil { - log.Printf("Seeking on the temporary file failed: %s\n", err.Error()) + log.Printf("Seeking on the temporary file failed: %s", err.Error()) return } if newOffSet != 0 { diff --git a/db4s/main.go b/db4s/main.go index 33f9f120d..285336467 100644 --- a/db4s/main.go +++ b/db4s/main.go @@ -121,7 +121,7 @@ func main() { } // Start server - log.Printf("Starting DB4S end point on %s\n", server) + log.Printf("Starting DB4S end point on %s", server) log.Fatal(newServer.ListenAndServeTLS(com.Conf.DB4S.Certificate, com.Conf.DB4S.CertificateKey)) } @@ -162,7 +162,7 @@ func branchListHandler(w http.ResponseWriter, r *http.Request) { // Return the list as JSON jsonList, err := json.MarshalIndent(brList, "", " ") if err != nil { - errMsg := fmt.Sprintf("Error when JSON marshalling the branch list: %v\n", err) + errMsg := fmt.Sprintf("Error when JSON marshalling the branch list: %v", err) log.Print(errMsg) http.Error(w, errMsg, http.StatusBadRequest) return @@ -248,7 +248,7 @@ func generateDefaultList(pageName string, userAcc string) (defaultList []byte, e // Use json.MarshalIndent() for nicer looking output defaultList, err = json.MarshalIndent(linkRows, "", " ") if err != nil { - log.Printf("%s: Error when JSON marshalling the default list: %v\n", pageName, err) + log.Printf("%s: Error when JSON marshalling the default list: %v", pageName, err) return nil, errors.Wrap(err, fmt.Sprintf("%s: Error when JSON marshalling the default list", pageName)) } @@ -448,7 +448,7 @@ func licenceAddHandler(w http.ResponseWriter, r *http.Request) { http.Error(w, fmt.Sprintf("Licence file is too large. Maximum licence upload size is %d MB, yours is %d MB", com.MaxLicenceSize, r.ContentLength/1024/1024), http.StatusBadRequest) - log.Println(fmt.Sprintf("'%s' attempted to upload an oversized licence %d MB in size. Limit is %d MB\n", + log.Println(fmt.Sprintf("'%s' attempted to upload an oversized licence %d MB in size. Limit is %d MB", userAcc, r.ContentLength/1024/1024, com.MaxLicenceSize)) return } @@ -533,7 +533,7 @@ func licenceAddHandler(w http.ResponseWriter, r *http.Request) { // Grab the uploaded file and form variables tempFile, _, err := r.FormFile("file1") if err != nil { - log.Printf("Uploading licence failed: %v\n", err) + log.Printf("Uploading licence failed: %v", err) http.Error(w, fmt.Sprintf("Something went wrong when extracting the licence text: '%s'", err.Error()), http.StatusBadRequest) return @@ -574,8 +574,8 @@ func licenceAddHandler(w http.ResponseWriter, r *http.Request) { w.WriteHeader(http.StatusCreated) _, _ = fmt.Fprintf(w, "Success") - // Log the new license addition - log.Printf("New licence '%s' added to the server by user '%v'\n", com.SanitiseLogString(licID), userAcc) + // Log the new licence addition + log.Printf("New licence '%s' added to the server by user '%v'", com.SanitiseLogString(licID), userAcc) return } @@ -636,13 +636,13 @@ func licenceGetHandler(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", mimeType) bytesWritten, err := fmt.Fprint(w, lic) if err != nil { - log.Printf("Error returning licence file: %v\n", err) + log.Printf("Error returning licence file: %v", err) http.Error(w, err.Error(), http.StatusInternalServerError) return } // Log the transfer - log.Printf("Licence '%s' downloaded by user '%v', %d bytes\n", com.SanitiseLogString(licenceName), userAcc, bytesWritten) + log.Printf("Licence '%s' downloaded by user '%v', %d bytes", com.SanitiseLogString(licenceName), userAcc, bytesWritten) return } @@ -659,7 +659,7 @@ func licenceListHandler(w http.ResponseWriter, r *http.Request) { licList, err := com.GetLicences(userAcc) jsonLicList, err := json.MarshalIndent(licList, "", " ") if err != nil { - errMsg := fmt.Sprintf("Error when JSON marshalling the licence list: %v\n", err) + errMsg := fmt.Sprintf("Error when JSON marshalling the licence list: %v", err) log.Print(errMsg) http.Error(w, errMsg, http.StatusBadRequest) return @@ -724,7 +724,7 @@ func licenceRemoveHandler(w http.ResponseWriter, r *http.Request) { fmt.Fprintf(w, "Success") // Log the transfer - log.Printf("Licence '%s' removed by user '%v'\n", com.SanitiseLogString(licenceName), userAcc) + log.Printf("Licence '%s' removed by user '%v'", com.SanitiseLogString(licenceName), userAcc) return } @@ -766,7 +766,7 @@ func metadataGetHandler(w http.ResponseWriter, r *http.Request) { // Return the list as JSON jsonList, err := json.MarshalIndent(meta, "", " ") if err != nil { - errMsg := fmt.Sprintf("Error when JSON marshalling the branch list: %v\n", err) + errMsg := fmt.Sprintf("Error when JSON marshalling the branch list: %v", err) log.Print(errMsg) http.Error(w, errMsg, http.StatusBadRequest) return @@ -831,7 +831,7 @@ func postHandler(w http.ResponseWriter, r *http.Request, userAcc string) { http.Error(w, fmt.Sprintf("Database is too large. Maximum database upload size is %d MB, yours is %d MB", com.MaxDatabaseSize, r.ContentLength/1024/1024), http.StatusBadRequest) - log.Println(fmt.Sprintf("'%s' attempted to upload an oversized database %d MB in size. Limit is %d MB\n", + log.Println(fmt.Sprintf("'%s' attempted to upload an oversized database %d MB in size. Limit is %d MB", userAcc, r.ContentLength/1024/1024, com.MaxDatabaseSize)) return } @@ -884,7 +884,7 @@ func retrieveDatabase(w http.ResponseWriter, r *http.Request, pageName string, u defer func() { err := com.MinioHandleClose(userDB) if err != nil { - log.Printf("%s: Error closing object handle: %v\n", pageName, err) + log.Printf("%s: Error closing object handle: %v", pageName, err) } }() @@ -920,7 +920,7 @@ func retrieveDatabase(w http.ResponseWriter, r *http.Request, pageName string, u w.Header().Set("Commit-ID", commit) bytesWritten, err := io.Copy(w, userDB) if err != nil { - log.Printf("%s: Error returning DB file: %v\n", pageName, err) + log.Printf("%s: Error returning DB file: %v", pageName, err) http.Error(w, err.Error(), http.StatusInternalServerError) return } @@ -958,8 +958,8 @@ func rootHandler(w http.ResponseWriter, r *http.Request) { case "POST": postHandler(w, r, userAcc) default: - log.Printf("%s: Unknown request method received from '%v\n", pageName, userAcc) - http.Error(w, fmt.Sprintf("Unknown request type: %v\n", reqType), http.StatusBadRequest) + log.Printf("%s: Unknown request method received from '%v", pageName, userAcc) + http.Error(w, fmt.Sprintf("Unknown request type: %v", reqType), http.StatusBadRequest) } return } diff --git a/webui/main.go b/webui/main.go index 5058d40fa..ab96ce5b5 100644 --- a/webui/main.go +++ b/webui/main.go @@ -72,7 +72,7 @@ func apiKeyGenHandler(w http.ResponseWriter, r *http.Request) { } // Log the key creation - log.Printf("New API key created for user '%s', key: '%s'\n", loggedInUser, key) + log.Printf("New API key created for user '%s', key: '%s'", loggedInUser, key) // Return the API key to the caller d := com.APIKey{ @@ -108,14 +108,14 @@ func auth0CallbackHandler(w http.ResponseWriter, r *http.Request) { } code := r.URL.Query().Get("code") if code == "" { - log.Printf("Login failure from '%v', probably due to blocked 3rd party cookies\n", r.RemoteAddr) + log.Printf("Login failure from '%v', probably due to blocked 3rd party cookies", r.RemoteAddr) errorPage(w, r, http.StatusInternalServerError, "Login failure. Please allow 3rd party cookies from https://dbhub.eu.auth0.com then try again (it should then work).") return } token, err := conf.Exchange(oauth2.NoContext, code) if err != nil { - log.Printf("Login failure: %s\n", err.Error()) + log.Printf("Login failure: %s", err.Error()) errorPage(w, r, http.StatusInternalServerError, "Login failed") return } @@ -152,7 +152,7 @@ func auth0CallbackHandler(w http.ResponseWriter, r *http.Request) { auth0ID = au.(string) } if auth0ID == "" { - log.Printf("Auth0 callback error: Auth0 ID string was empty. Email: %s\n", email) + log.Printf("Auth0 callback error: Auth0 ID string was empty. Email: %s", email) errorPage(w, r, http.StatusInternalServerError, "Error: Auth0 ID string was empty") return } @@ -498,7 +498,7 @@ func createBranchHandler(w http.ResponseWriter, r *http.Request) { commitCount++ c, ok = commitList[c.Parent] if !ok { - log.Printf("Error when counting commits in new branch '%s' of database '%s/%s'\n", com.SanitiseLogString(branchName), + log.Printf("Error when counting commits in new branch '%s' of database '%s/%s'", com.SanitiseLogString(branchName), com.SanitiseLogString(dbOwner), com.SanitiseLogString(dbName)) return } @@ -521,7 +521,7 @@ func createBranchHandler(w http.ResponseWriter, r *http.Request) { err = com.InvalidateCacheEntry(loggedInUser, dbOwner, dbName, "") // Empty string indicates "for all versions" if err != nil { // Something went wrong when invalidating memcached entries for the database - log.Printf("Error when invalidating memcache entries: %s\n", err.Error()) + log.Printf("Error when invalidating memcache entries: %s", err.Error()) return } @@ -562,7 +562,7 @@ func createCommentHandler(w http.ResponseWriter, r *http.Request) { } discID, err := strconv.Atoi(a) if err != nil { - log.Printf("Error converting string '%s' to integer in function '%s': %s\n", com.SanitiseLogString(a), + log.Printf("Error converting string '%s' to integer in function '%s': %s", com.SanitiseLogString(a), com.GetCurrentFunctionName(), err) w.WriteHeader(http.StatusBadRequest) fmt.Fprint(w, "Error when parsing discussion id value") @@ -630,7 +630,7 @@ func createCommentHandler(w http.ResponseWriter, r *http.Request) { err = com.InvalidateCacheEntry(loggedInUser, dbOwner, dbName, "") // Empty string indicates "for all versions" if err != nil { // Something went wrong when invalidating memcached entries for the database - log.Printf("Error when invalidating memcache entries: %s\n", err.Error()) + log.Printf("Error when invalidating memcache entries: %s", err.Error()) return } } @@ -715,7 +715,7 @@ func createDiscussHandler(w http.ResponseWriter, r *http.Request) { } err = com.NewEvent(details) if err != nil { - log.Printf("Error when creating a new event: %s\n", err.Error()) + log.Printf("Error when creating a new event: %s", err.Error()) return } @@ -723,7 +723,7 @@ func createDiscussHandler(w http.ResponseWriter, r *http.Request) { err = com.InvalidateCacheEntry(loggedInUser, dbOwner, dbName, "") // Empty string indicates "for all versions" if err != nil { // Something went wrong when invalidating memcached entries for the database - log.Printf("Error when invalidating memcache entries: %s\n", err.Error()) + log.Printf("Error when invalidating memcache entries: %s", err.Error()) return } @@ -970,7 +970,7 @@ func createMergeHandler(w http.ResponseWriter, r *http.Request) { } err = com.NewEvent(details) if err != nil { - log.Printf("Error when creating a new event: %s\n", err.Error()) + log.Printf("Error when creating a new event: %s", err.Error()) return } @@ -978,7 +978,7 @@ func createMergeHandler(w http.ResponseWriter, r *http.Request) { err = com.InvalidateCacheEntry(loggedInUser, destOwner, destDBName, "") // Empty string indicates "for all versions" if err != nil { // Something went wrong when invalidating memcached entries for the database - log.Printf("Error when invalidating memcache entries: %s\n", err.Error()) + log.Printf("Error when invalidating memcache entries: %s", err.Error()) return } @@ -1104,7 +1104,7 @@ func createTagHandler(w http.ResponseWriter, r *http.Request) { err = com.InvalidateCacheEntry(loggedInUser, dbOwner, dbName, "") // Empty string indicates "for all versions" if err != nil { // Something went wrong when invalidating memcached entries for the database - log.Printf("Error when invalidating memcache entries: %s\n", err.Error()) + log.Printf("Error when invalidating memcache entries: %s", err.Error()) return } @@ -1149,7 +1149,7 @@ func createTagHandler(w http.ResponseWriter, r *http.Request) { err = com.InvalidateCacheEntry(loggedInUser, dbOwner, dbName, "") // Empty string indicates "for all versions" if err != nil { // Something went wrong when invalidating memcached entries for the database - log.Printf("Error when invalidating memcache entries: %s\n", err.Error()) + log.Printf("Error when invalidating memcache entries: %s", err.Error()) return } @@ -1201,7 +1201,7 @@ func createUserHandler(w http.ResponseWriter, r *http.Request) { // Gather submitted form data (if any) err = r.ParseForm() if err != nil { - log.Printf("Error when parsing user creation data: %s\n", err) + log.Printf("Error when parsing user creation data: %s", err) errorPage(w, r, http.StatusBadRequest, "Error when parsing user creation data") return } @@ -1284,7 +1284,7 @@ func createUserHandler(w http.ResponseWriter, r *http.Request) { if displayName != "" { err = com.Validate.Var(displayName, "required,displayname,min=1,max=80") if err != nil { - log.Printf("Display name value failed validation: %s\n", err) + log.Printf("Display name value failed validation: %s", err) errorPage(w, r, http.StatusBadRequest, "Error when parsing full name value") return } @@ -1299,7 +1299,7 @@ func createUserHandler(w http.ResponseWriter, r *http.Request) { serverName := strings.Split(com.Conf.Web.ServerName, ":") em := fmt.Sprintf("%s@%s", userName, serverName[0]) if email != em { - log.Printf("Email value failed validation: %s\n", err) + log.Printf("Email value failed validation: %s", err) errorPage(w, r, http.StatusBadRequest, "Error when parsing email value") return } @@ -1518,7 +1518,7 @@ func deleteBranchHandler(w http.ResponseWriter, r *http.Request) { c, ok := commitList[branch.Commit] if !ok { log.Printf("Error when checking for isolated tags while deleting branch '%s' of database "+ - "'%s/%s'\n", com.SanitiseLogString(branchName), com.SanitiseLogString(dbOwner), com.SanitiseLogString(dbName)) + "'%s/%s'", com.SanitiseLogString(branchName), com.SanitiseLogString(dbOwner), com.SanitiseLogString(dbName)) w.WriteHeader(http.StatusInternalServerError) return } @@ -1533,7 +1533,7 @@ func deleteBranchHandler(w http.ResponseWriter, r *http.Request) { c, ok = commitList[c.Parent] if !ok { log.Printf("Error when checking for isolated tags while deleting branch '%s' of database "+ - "'%s/%s'\n", com.SanitiseLogString(branchName), com.SanitiseLogString(dbOwner), com.SanitiseLogString(dbName)) + "'%s/%s'", com.SanitiseLogString(branchName), com.SanitiseLogString(dbOwner), com.SanitiseLogString(dbName)) w.WriteHeader(http.StatusInternalServerError) return } @@ -1570,7 +1570,7 @@ func deleteBranchHandler(w http.ResponseWriter, r *http.Request) { c, ok = commitList[c.Parent] if !ok { log.Printf("Error when checking for isolated tags while deleting branch '%s' of "+ - "database '%s/%s'\n", com.SanitiseLogString(branchName), com.SanitiseLogString(dbOwner), com.SanitiseLogString(dbName)) + "database '%s/%s'", com.SanitiseLogString(branchName), com.SanitiseLogString(dbOwner), com.SanitiseLogString(dbName)) w.WriteHeader(http.StatusInternalServerError) return } @@ -1615,7 +1615,7 @@ func deleteBranchHandler(w http.ResponseWriter, r *http.Request) { c, ok := commitList[branch.Commit] if !ok { log.Printf("Error when checking for isolated releases while deleting branch '%s' of database "+ - "'%s/%s'\n", com.SanitiseLogString(branchName), com.SanitiseLogString(dbOwner), com.SanitiseLogString(dbName)) + "'%s/%s'", com.SanitiseLogString(branchName), com.SanitiseLogString(dbOwner), com.SanitiseLogString(dbName)) w.WriteHeader(http.StatusInternalServerError) return } @@ -1630,7 +1630,7 @@ func deleteBranchHandler(w http.ResponseWriter, r *http.Request) { c, ok = commitList[c.Parent] if !ok { log.Printf("Error when checking for isolated releases while deleting branch '%s' of database "+ - "'%s/%s'\n", com.SanitiseLogString(branchName), com.SanitiseLogString(dbOwner), com.SanitiseLogString(dbName)) + "'%s/%s'", com.SanitiseLogString(branchName), com.SanitiseLogString(dbOwner), com.SanitiseLogString(dbName)) w.WriteHeader(http.StatusInternalServerError) return } @@ -1667,7 +1667,7 @@ func deleteBranchHandler(w http.ResponseWriter, r *http.Request) { c, ok = commitList[c.Parent] if !ok { log.Printf("Error when checking for isolated releases while deleting branch '%s' of "+ - "database '%s/%s'\n", com.SanitiseLogString(branchName), com.SanitiseLogString(dbOwner), com.SanitiseLogString(dbName)) + "database '%s/%s'", com.SanitiseLogString(branchName), com.SanitiseLogString(dbOwner), com.SanitiseLogString(dbName)) w.WriteHeader(http.StatusInternalServerError) return } @@ -1708,7 +1708,7 @@ func deleteBranchHandler(w http.ResponseWriter, r *http.Request) { lst := map[string]bool{} c, ok := commitList[branch.Commit] if !ok { - log.Printf("Error when creating commit list while deleting branch '%s' of database '%s/%s'\n", + log.Printf("Error when creating commit list while deleting branch '%s' of database '%s/%s'", com.SanitiseLogString(branchName), com.SanitiseLogString(dbOwner), com.SanitiseLogString(dbName)) w.WriteHeader(http.StatusInternalServerError) return @@ -1717,7 +1717,7 @@ func deleteBranchHandler(w http.ResponseWriter, r *http.Request) { for c.Parent != "" { c, ok = commitList[c.Parent] if !ok { - log.Printf("Error when creating commit list while deleting branch '%s' of database '%s/%s'\n", + log.Printf("Error when creating commit list while deleting branch '%s' of database '%s/%s'", com.SanitiseLogString(branchName), com.SanitiseLogString(dbOwner), com.SanitiseLogString(dbName)) w.WriteHeader(http.StatusInternalServerError) return @@ -1782,7 +1782,7 @@ func deleteBranchHandler(w http.ResponseWriter, r *http.Request) { } err = com.StoreCommits(dbOwner, dbName, commitList) if err != nil { - log.Printf("Error when updating commit list while deleting branch '%s' of database '%s/%s': %s\n", + log.Printf("Error when updating commit list while deleting branch '%s' of database '%s/%s': %s", com.SanitiseLogString(branchName), com.SanitiseLogString(dbOwner), com.SanitiseLogString(dbName), err.Error()) w.WriteHeader(http.StatusInternalServerError) return @@ -1792,7 +1792,7 @@ func deleteBranchHandler(w http.ResponseWriter, r *http.Request) { err = com.InvalidateCacheEntry(loggedInUser, dbOwner, dbName, "") // Empty string indicates "for all versions" if err != nil { // Something went wrong when invalidating memcached entries for the database - log.Printf("Error when invalidating memcache entries: %s\n", err.Error()) + log.Printf("Error when invalidating memcache entries: %s", err.Error()) return } @@ -1833,7 +1833,7 @@ func deleteCommentHandler(w http.ResponseWriter, r *http.Request) { } discID, err := strconv.Atoi(a) if err != nil { - log.Printf("Error converting string '%s' to integer in function '%s': %s\n", com.SanitiseLogString(a), + log.Printf("Error converting string '%s' to integer in function '%s': %s", com.SanitiseLogString(a), com.GetCurrentFunctionName(), err) w.WriteHeader(http.StatusBadRequest) fmt.Fprint(w, "Error when parsing discussion id value") @@ -1849,7 +1849,7 @@ func deleteCommentHandler(w http.ResponseWriter, r *http.Request) { } comID, err := strconv.Atoi(a) if err != nil { - log.Printf("Error converting string '%s' to integer in function '%s': %s\n", com.SanitiseLogString(a), + log.Printf("Error converting string '%s' to integer in function '%s': %s", com.SanitiseLogString(a), com.GetCurrentFunctionName(), err) w.WriteHeader(http.StatusBadRequest) fmt.Fprint(w, "Error when parsing comment id value") @@ -2095,7 +2095,7 @@ func deleteCommitHandler(w http.ResponseWriter, r *http.Request) { err = com.InvalidateCacheEntry(loggedInUser, dbOwner, dbName, "") // Empty string indicates "for all versions" if err != nil { // Something went wrong when invalidating memcached entries for the database - log.Printf("Error when invalidating memcache entries: %s\n", err.Error()) + log.Printf("Error when invalidating memcache entries: %s", err.Error()) return } @@ -2238,7 +2238,7 @@ func deleteDatabaseHandler(w http.ResponseWriter, r *http.Request) { return } if !exists { - log.Printf("%s: Missing database for '%s/%s' when attempting deletion\n", pageName, com.SanitiseLogString(dbOwner), com.SanitiseLogString(dbName)) + log.Printf("%s: Missing database for '%s/%s' when attempting deletion", pageName, com.SanitiseLogString(dbOwner), com.SanitiseLogString(dbName)) w.WriteHeader(http.StatusNotFound) fmt.Fprint(w, "Internal server error") return @@ -2391,7 +2391,7 @@ func deleteReleaseHandler(w http.ResponseWriter, r *http.Request) { err = com.InvalidateCacheEntry(loggedInUser, dbOwner, dbName, "") // Empty string indicates "for all versions" if err != nil { // Something went wrong when invalidating memcached entries for the database - log.Printf("Error when invalidating memcache entries: %s\n", err.Error()) + log.Printf("Error when invalidating memcache entries: %s", err.Error()) return } @@ -2472,7 +2472,7 @@ func deleteTagHandler(w http.ResponseWriter, r *http.Request) { err = com.InvalidateCacheEntry(loggedInUser, dbOwner, dbName, "") // Empty string indicates "for all versions" if err != nil { // Something went wrong when invalidating memcached entries for the database - log.Printf("Error when invalidating memcache entries: %s\n", err.Error()) + log.Printf("Error when invalidating memcache entries: %s", err.Error()) return } @@ -2723,7 +2723,7 @@ func downloadCSVHandler(w http.ResponseWriter, r *http.Request) { // Abort if the table name was missing if dbTable == "" { - log.Printf("%s: Missing table name\n", pageName) + log.Printf("%s: Missing table name", pageName) errorPage(w, r, http.StatusBadRequest, "Missing table name") return } @@ -2788,7 +2788,7 @@ func downloadCSVHandler(w http.ResponseWriter, r *http.Request) { csvFile.UseCRLF = win err = csvFile.WriteAll(resultSet) if err != nil { - log.Printf("%s: Error when generating CSV: %v\n", pageName, err) + log.Printf("%s: Error when generating CSV: %v", pageName, err) errorPage(w, r, http.StatusInternalServerError, "Error when generating CSV") return } @@ -2903,12 +2903,12 @@ func forkDBHandler(w http.ResponseWriter, r *http.Request) { err = com.InvalidateCacheEntry(loggedInUser, dbOwner, dbName, "") // Empty string indicates "for all versions" if err != nil { // Something went wrong when invalidating memcached entries for the database - log.Printf("Error when invalidating memcache entries: %s\n", err.Error()) + log.Printf("Error when invalidating memcache entries: %s", err.Error()) return } // Log the database fork - log.Printf("Database '%s/%s' forked to user '%s'\n", com.SanitiseLogString(dbOwner), com.SanitiseLogString(dbName), loggedInUser) + log.Printf("Database '%s/%s' forked to user '%s'", com.SanitiseLogString(dbOwner), com.SanitiseLogString(dbName), loggedInUser) // Bounce to the page of the forked database http.Redirect(w, r, fmt.Sprintf("/%s/%s", loggedInUser, dbName), http.StatusSeeOther) @@ -2933,7 +2933,7 @@ func generateCertHandler(w http.ResponseWriter, r *http.Request) { // Generate a new certificate newCert, err := com.GenerateClientCert(loggedInUser) if err != nil { - log.Printf("Error generating client certificate for user '%s': %s!\n", loggedInUser, err) + log.Printf("Error generating client certificate for user '%s': %s!", loggedInUser, err) errorPage(w, r, http.StatusInternalServerError, "Error generating client certificate") return } @@ -3137,7 +3137,7 @@ func main() { log.Fatalf("Error when opening request log: %s\n", err) } defer reqLog.Close() - log.Printf("Request log opened: %s\n", com.Conf.Web.RequestLog) + log.Printf("Request log opened: %s", com.Conf.Web.RequestLog) // Parse our template files tmpl = template.Must(template.New("templates").Delims("[[", "]]").ParseGlob( @@ -3501,7 +3501,7 @@ func main() { }))) // Start webUI server - log.Printf("WebUI server starting on https://%s\n", com.Conf.Web.ServerName) + log.Printf("WebUI server starting on https://%s", com.Conf.Web.ServerName) srv := &http.Server{ Addr: com.Conf.Web.BindAddress, ErrorLog: com.HttpErrorLog(), @@ -3632,7 +3632,7 @@ func mergeRequestHandler(w http.ResponseWriter, r *http.Request) { } mrID, err := strconv.Atoi(a) if err != nil { - log.Printf("Error converting string '%s' to integer in function '%s': %s\n", com.SanitiseLogString(a), + log.Printf("Error converting string '%s' to integer in function '%s': %s", com.SanitiseLogString(a), com.GetCurrentFunctionName(), err) w.WriteHeader(http.StatusBadRequest) fmt.Fprint(w, "Error when parsing merge request id value") @@ -3695,7 +3695,7 @@ func mergeRequestHandler(w http.ResponseWriter, r *http.Request) { err = com.InvalidateCacheEntry(loggedInUser, dbOwner, dbName, "") // Empty string indicates "for all versions" if err != nil { // Something went wrong when invalidating memcached entries for the database - log.Printf("Error when invalidating memcache entries: %s\n", err.Error()) + log.Printf("Error when invalidating memcache entries: %s", err.Error()) return } @@ -3744,19 +3744,19 @@ func prefHandler(w http.ResponseWriter, r *http.Request) { // Validate submitted form data err = com.Validate.Var(maxRows, "required,numeric,min=1,max=500") if err != nil { - log.Printf("%s: Maximum rows value failed validation: %s\n", pageName, err) + log.Printf("%s: Maximum rows value failed validation: %s", pageName, err) errorPage(w, r, http.StatusBadRequest, "Error when parsing maximum rows preference value") return } maxRowsNum, err := strconv.Atoi(maxRows) if err != nil { - log.Printf("%s: Error converting string '%v' to integer: %s\n", pageName, com.SanitiseLogString(maxRows), err) + log.Printf("%s: Error converting string '%v' to integer: %s", pageName, com.SanitiseLogString(maxRows), err) errorPage(w, r, http.StatusBadRequest, "Error when parsing preference data") return } err = com.ValidateDisplayName(displayName) if err != nil { - log.Printf("%s: Display name '%s' failed validation: %s\n", pageName, com.SanitiseLogString(displayName), err) + log.Printf("%s: Display name '%s' failed validation: %s", pageName, com.SanitiseLogString(displayName), err) errorPage(w, r, http.StatusBadRequest, "Error when parsing full name value") return } @@ -3767,7 +3767,7 @@ func prefHandler(w http.ResponseWriter, r *http.Request) { serverName := strings.Split(com.Conf.Web.ServerName, ":") em := fmt.Sprintf("%s@%s", loggedInUser, serverName[0]) if email != em { - log.Printf("%s: Email value failed validation: %s\n", pageName, err) + log.Printf("%s: Email value failed validation: %s", pageName, err) errorPage(w, r, http.StatusBadRequest, "Error when parsing email value") return } @@ -3914,7 +3914,7 @@ func saveSettingsHandler(w http.ResponseWriter, r *http.Request) { // Grab and validate the supplied "public" form field public, err := com.GetPub(r) if err != nil { - log.Printf("Error when converting public value to boolean: %v\n", err) + log.Printf("Error when converting public value to boolean: %v", err) errorPage(w, r, http.StatusBadRequest, "Public value incorrect") return } @@ -4141,7 +4141,7 @@ func saveSettingsHandler(w http.ResponseWriter, r *http.Request) { } if tablePresent == false { // The requested table doesn't exist in the database - log.Printf("Requested table '%s' not present in database '%s/%s'\n", + log.Printf("Requested table '%s' not present in database '%s/%s'", com.SanitiseLogString(defTable), com.SanitiseLogString(dbOwner), com.SanitiseLogString(dbName)) errorPage(w, r, http.StatusBadRequest, "Requested table not present") return @@ -4272,7 +4272,7 @@ func setDefaultBranchHandler(w http.ResponseWriter, r *http.Request) { err = com.InvalidateCacheEntry(loggedInUser, dbOwner, dbName, "") // Empty string indicates "for all versions" if err != nil { // Something went wrong when invalidating memcached entries for the database - log.Printf("Error when invalidating memcache entries: %s\n", err.Error()) + log.Printf("Error when invalidating memcache entries: %s", err.Error()) return } @@ -4315,7 +4315,7 @@ func starToggleHandler(w http.ResponseWriter, r *http.Request) { err = com.InvalidateCacheEntry(loggedInUser, dbOwner, dbName, "") // Empty string indicates "for all versions" if err != nil { // Something went wrong when invalidating memcached entries for the database - log.Printf("Error when invalidating memcache entries: %s\n", err.Error()) + log.Printf("Error when invalidating memcache entries: %s", err.Error()) return } @@ -4520,7 +4520,7 @@ func tableViewHandler(w http.ResponseWriter, r *http.Request) { // careful than usual err = com.ValidateFieldName(sortCol) if err != nil { - log.Printf("Validation failed on requested sort field name '%v': %v\n", com.SanitiseLogString(sortCol), + log.Printf("Validation failed on requested sort field name '%v': %v", com.SanitiseLogString(sortCol), err.Error()) w.WriteHeader(http.StatusBadRequest) return @@ -4684,7 +4684,7 @@ func tableViewHandler(w http.ResponseWriter, r *http.Request) { var colList []sqlite.Column colList, err = sdb.Columns("", requestedTable) if err != nil { - log.Printf("Error when reading column names for table '%s': %v\n", com.SanitiseLogString(requestedTable), + log.Printf("Error when reading column names for table '%s': %v", com.SanitiseLogString(requestedTable), err.Error()) w.WriteHeader(http.StatusInternalServerError) return @@ -4705,7 +4705,7 @@ func tableViewHandler(w http.ResponseWriter, r *http.Request) { dataRows, err = com.ReadSQLiteDB(sdb, requestedTable, sortCol, sortDir, maxRows, rowOffset) if err != nil { // Some kind of error when reading the database data - log.Printf("Error occurred when reading table data for '%s/%s', commit '%s': %s\n", com.SanitiseLogString(dbOwner), + log.Printf("Error occurred when reading table data for '%s/%s', commit '%s': %s", com.SanitiseLogString(dbOwner), com.SanitiseLogString(dbName), com.SanitiseLogString(commitID), err.Error()) w.WriteHeader(http.StatusInternalServerError) return @@ -4721,7 +4721,7 @@ func tableViewHandler(w http.ResponseWriter, r *http.Request) { // Cache the data in memcache err = com.CacheData(dataCacheKey, dataRows, com.Conf.Memcache.DefaultCacheTime) if err != nil { - log.Printf("%s: Error when caching table data for '%s/%s': %v\n", pageName, com.SanitiseLogString(dbOwner), + log.Printf("%s: Error when caching table data for '%s/%s': %v", pageName, com.SanitiseLogString(dbOwner), com.SanitiseLogString(dbName), err) } } @@ -4887,7 +4887,7 @@ func updateBranchHandler(w http.ResponseWriter, r *http.Request) { err = com.InvalidateCacheEntry(loggedInUser, dbOwner, dbName, "") // Empty string indicates "for all versions" if err != nil { // Something went wrong when invalidating memcached entries for the database - log.Printf("Error when invalidating memcache entries: %s\n", err.Error()) + log.Printf("Error when invalidating memcache entries: %s", err.Error()) return } @@ -4927,7 +4927,7 @@ func updateCommentHandler(w http.ResponseWriter, r *http.Request) { } discID, err := strconv.Atoi(a) if err != nil { - log.Printf("Error converting string '%s' to integer in function '%s': %s\n", com.SanitiseLogString(a), + log.Printf("Error converting string '%s' to integer in function '%s': %s", com.SanitiseLogString(a), com.GetCurrentFunctionName(), err) w.WriteHeader(http.StatusBadRequest) fmt.Fprint(w, "Error when parsing discussion id value") @@ -4943,7 +4943,7 @@ func updateCommentHandler(w http.ResponseWriter, r *http.Request) { } comID, err := strconv.Atoi(b) if err != nil { - log.Printf("Error converting string '%s' to integer in function '%s': %s\n", com.SanitiseLogString(a), + log.Printf("Error converting string '%s' to integer in function '%s': %s", com.SanitiseLogString(a), com.GetCurrentFunctionName(), err) w.WriteHeader(http.StatusBadRequest) fmt.Fprint(w, "Error when parsing comment id value") @@ -5136,7 +5136,7 @@ func updateDiscussHandler(w http.ResponseWriter, r *http.Request) { } discID, err := strconv.Atoi(a) if err != nil { - log.Printf("Error converting string '%s' to integer in function '%s': %s\n", com.SanitiseLogString(a), + log.Printf("Error converting string '%s' to integer in function '%s': %s", com.SanitiseLogString(a), com.GetCurrentFunctionName(), err) w.WriteHeader(http.StatusBadRequest) fmt.Fprint(w, "Error when parsing discussion id value") @@ -5473,7 +5473,7 @@ func uploadDataHandler(w http.ResponseWriter, r *http.Request) { errorPage(w, r, http.StatusBadRequest, fmt.Sprintf("Database is too large. Maximum database upload size is %d MB, yours is %d MB", com.MaxDatabaseSize, r.ContentLength/1024/1024)) - log.Println(fmt.Sprintf("'%s' attempted to upload an oversized database %d MB in size. Limit is %d MB\n", + log.Println(fmt.Sprintf("'%s' attempted to upload an oversized database %d MB in size. Limit is %d MB", loggedInUser, r.ContentLength/1024/1024, com.MaxDatabaseSize)) return } @@ -5487,7 +5487,7 @@ func uploadDataHandler(w http.ResponseWriter, r *http.Request) { return } if err = r.ParseForm(); err != nil { - log.Printf("%s: ParseForm() error: %v\n", pageName, err) + log.Printf("%s: ParseForm() error: %v", pageName, err) errorPage(w, r, http.StatusInternalServerError, err.Error()) return } @@ -5497,7 +5497,7 @@ func uploadDataHandler(w http.ResponseWriter, r *http.Request) { var public bool public, err = com.GetPub(r) if err != nil { - log.Printf("%s: Error when converting public value to boolean: %v\n", pageName, err) + log.Printf("%s: Error when converting public value to boolean: %v", pageName, err) errorPage(w, r, http.StatusBadRequest, fmt.Sprintf("Public value '%v' incorrect", html.EscapeString(r.PostFormValue("public")))) return } @@ -5511,7 +5511,7 @@ func uploadDataHandler(w http.ResponseWriter, r *http.Request) { var isLiveDB bool isLiveDB, err = com.GetFormLive(r) if err != nil { - log.Printf("%s: Error when converting live value to boolean: %v\n", pageName, err) + log.Printf("%s: Error when converting live value to boolean: %v", pageName, err) errorPage(w, r, http.StatusBadRequest, fmt.Sprintf("Live value '%v' incorrect", html.EscapeString(r.PostFormValue("live")))) return } @@ -5545,7 +5545,7 @@ func uploadDataHandler(w http.ResponseWriter, r *http.Request) { // Validate the (optional) branch name branchName, err := com.GetFormBranch(r) if err != nil { - log.Printf("%s: Error when validating branch name '%s': %v\n", pageName, com.SanitiseLogString(branchName), err) + log.Printf("%s: Error when validating branch name '%s': %v", pageName, com.SanitiseLogString(branchName), err) errorPage(w, r, http.StatusBadRequest, "Branch name value failed validation") return } @@ -5554,7 +5554,7 @@ func uploadDataHandler(w http.ResponseWriter, r *http.Request) { tempFile, handler, err := r.FormFile("database") if err != nil { - log.Printf("%s: Uploading file failed: %v\n", pageName, err) + log.Printf("%s: Uploading file failed: %v", pageName, err) errorPage(w, r, http.StatusInternalServerError, "Database file missing from upload data?") return } @@ -5653,7 +5653,7 @@ func uploadDataHandler(w http.ResponseWriter, r *http.Request) { } // Log the successful database upload, and bounce the user to the database view page - log.Printf("%s: Username: '%s', database '%s/%s' uploaded', bytes: %v\n", pageName, loggedInUser, + log.Printf("%s: Username: '%s', database '%s/%s' uploaded', bytes: %v", pageName, loggedInUser, com.SanitiseLogString(dbOwner), com.SanitiseLogString(dbName), numBytes) http.Redirect(w, r, fmt.Sprintf("/%s/%s?branch=%s", html.EscapeString(dbOwner), html.EscapeString(dbName), html.EscapeString(branchName)), http.StatusSeeOther) return @@ -5742,7 +5742,7 @@ func watchToggleHandler(w http.ResponseWriter, r *http.Request) { err = com.InvalidateCacheEntry(loggedInUser, dbOwner, dbName, "") // Empty string indicates "for all versions" if err != nil { // Something went wrong when invalidating memcached entries for the database - log.Printf("Error when invalidating memcache entries: %s\n", err.Error()) + log.Printf("Error when invalidating memcache entries: %s", err.Error()) w.WriteHeader(http.StatusInternalServerError) fmt.Fprint(w, err.Error()) return diff --git a/webui/pages.go b/webui/pages.go index f967b1be6..567b921e8 100644 --- a/webui/pages.go +++ b/webui/pages.go @@ -1046,7 +1046,7 @@ func discussPage(w http.ResponseWriter, r *http.Request) { if a != "" && a != "{{ row.disc_id }}" { // Search engines have a habit of passing AngularJS tags, so we ignore when the field has the AngularJS tag in it pageData.SelectedID, err = strconv.Atoi(a) if err != nil { - log.Printf("Error converting string '%s' to integer in function '%s': %s\n", com.SanitiseLogString(a), + log.Printf("Error converting string '%s' to integer in function '%s': %s", com.SanitiseLogString(a), com.GetCurrentFunctionName(), err) errorPage(w, r, http.StatusBadRequest, "Error when parsing discussion id value") return @@ -1249,7 +1249,7 @@ func mergePage(w http.ResponseWriter, r *http.Request) { var err error pageData.SelectedID, err = strconv.Atoi(a) if err != nil { - log.Printf("Error converting string '%s' to integer in function '%s': %s\n", com.SanitiseLogString(a), + log.Printf("Error converting string '%s' to integer in function '%s': %s", com.SanitiseLogString(a), com.GetCurrentFunctionName(), err) errorPage(w, r, http.StatusBadRequest, "Error when parsing discussion id value") return @@ -1702,18 +1702,18 @@ func profilePage(w http.ResponseWriter, r *http.Request, userName string) { func releasesPage(w http.ResponseWriter, r *http.Request) { // Structure to hold page data type tgEntry struct { - AvatarURL string `json:"avatar_url"` - Commit string `json:"commit"` - Date time.Time `json:"date"` - Description string `json:"description"` - Size int64 `json:"size"` - TaggerUserName string `json:"tagger_user_name"` - TaggerDisplayName string `json:"tagger_display_name"` + AvatarURL string `json:"avatar_url"` + Commit string `json:"commit"` + Date time.Time `json:"date"` + Description string `json:"description"` + Size int64 `json:"size"` + TaggerUserName string `json:"tagger_user_name"` + TaggerDisplayName string `json:"tagger_display_name"` } var pageData struct { - DB com.SQLiteDBinfo - PageMeta PageMetaInfo - TagList map[string]tgEntry + DB com.SQLiteDBinfo + PageMeta PageMetaInfo + TagList map[string]tgEntry } pageData.PageMeta.Title = "Release list" pageData.PageMeta.PageSection = "db_data" @@ -1772,13 +1772,13 @@ func releasesPage(w http.ResponseWriter, r *http.Request) { // Create the tag info we pass to the tag list rendering page pageData.TagList[i] = tgEntry{ - AvatarURL: userNameCache[j.ReleaserEmail].AvatarURL, - Commit: j.Commit, - Date: j.Date, - Description: j.Description, - Size: j.Size, - TaggerUserName: userNameCache[j.ReleaserEmail].Email, - TaggerDisplayName: j.ReleaserName, + AvatarURL: userNameCache[j.ReleaserEmail].AvatarURL, + Commit: j.Commit, + Date: j.Date, + Description: j.Description, + Size: j.Size, + TaggerUserName: userNameCache[j.ReleaserEmail].Email, + TaggerDisplayName: j.ReleaserName, } } } @@ -2045,13 +2045,13 @@ func starsPage(w http.ResponseWriter, r *http.Request) { func tagsPage(w http.ResponseWriter, r *http.Request) { // Structure to hold page data type tgEntry struct { - AvatarURL string `json:"avatar_url"` - Commit string `json:"commit"` - Date time.Time `json:"date"` - Description string `json:"description"` - Size int `json:"size"` - TaggerUserName string `json:"tagger_user_name"` - TaggerDisplayName string `json:"tagger_display_name"` + AvatarURL string `json:"avatar_url"` + Commit string `json:"commit"` + Date time.Time `json:"date"` + Description string `json:"description"` + Size int `json:"size"` + TaggerUserName string `json:"tagger_user_name"` + TaggerDisplayName string `json:"tagger_display_name"` } var pageData struct { DB com.SQLiteDBinfo @@ -2115,12 +2115,12 @@ func tagsPage(w http.ResponseWriter, r *http.Request) { // Create the tag info we pass to the tag list rendering page pageData.TagList[i] = tgEntry{ - AvatarURL: userNameCache[j.TaggerEmail].AvatarURL, - Commit: j.Commit, - Date: j.Date, - Description: j.Description, - TaggerUserName: userNameCache[j.TaggerEmail].Email, - TaggerDisplayName: j.TaggerName, + AvatarURL: userNameCache[j.TaggerEmail].AvatarURL, + Commit: j.Commit, + Date: j.Date, + Description: j.Description, + TaggerUserName: userNameCache[j.TaggerEmail].Email, + TaggerDisplayName: j.TaggerName, } } } diff --git a/webui/vis.go b/webui/vis.go index bea7160d3..c3de784d9 100644 --- a/webui/vis.go +++ b/webui/vis.go @@ -441,7 +441,7 @@ func visDownloadResults(w http.ResponseWriter, r *http.Request) { output.UseCRLF = win err = output.WriteAll(newData) if err != nil { - log.Printf("Error when generating CSV: %v\n", err) + log.Printf("Error when generating CSV: %v", err) w.WriteHeader(http.StatusInternalServerError) fmt.Fprint(w, err) return @@ -676,7 +676,7 @@ func visSave(w http.ResponseWriter, r *http.Request) { // Validate the X axis field name err = com.ValidateFieldName(xAxis) if err != nil { - log.Printf("Validation failed on requested X axis field name '%v': %v\n", com.SanitiseLogString(xAxis), err.Error()) + log.Printf("Validation failed on requested X axis field name '%v': %v", com.SanitiseLogString(xAxis), err.Error()) w.WriteHeader(http.StatusBadRequest) return } @@ -684,7 +684,7 @@ func visSave(w http.ResponseWriter, r *http.Request) { // Validate the Y axis field name err = com.ValidateFieldName(yAxis) if err != nil { - log.Printf("Validation failed on requested Y axis field name '%v': %v\n", com.SanitiseLogString(yAxis), err.Error()) + log.Printf("Validation failed on requested Y axis field name '%v': %v", com.SanitiseLogString(yAxis), err.Error()) w.WriteHeader(http.StatusBadRequest) return } @@ -796,24 +796,12 @@ func visSave(w http.ResponseWriter, r *http.Request) { // Save the SQLite visualisation parameters err = com.VisualisationSaveParams(dbOwner, dbName, visName, vParams) if err != nil { - log.Printf("Error occurred when saving visualisation '%s' for' '%s/%s', commit '%s': %s\n", com.SanitiseLogString(visName), + log.Printf("Error occurred when saving visualisation '%s' for' '%s/%s', commit '%s': %s", com.SanitiseLogString(visName), com.SanitiseLogString(dbOwner), com.SanitiseLogString(dbName), com.SanitiseLogString(commitID), err.Error()) w.WriteHeader(http.StatusInternalServerError) return } - // TODO: Cache the SQLite visualisation data - // * We'll probably need to update the SQLite authoriser code to catch SQLite functions which shouldn't be - // cached - such as random() - and not cache those results - //hash := visHash(dbOwner, dbName, commitID, visName, vParams) - //err = com.VisualisationSaveData(dbOwner, dbName, commitID, hash, visData) - //if err != nil { - // log.Printf("Error occurred when saving visualisation '%s' for' '%s%s%s', commit '%s': %s\n", visName, - // dbOwner, dbName, commitID, err.Error()) - // w.WriteHeader(http.StatusInternalServerError) - // return - //} - // Save succeeded w.WriteHeader(http.StatusOK) }