From eda5a5593b3d58a8e0fd2e8bbd5597bfd24b7bf0 Mon Sep 17 00:00:00 2001 From: Josef Zoller Date: Tue, 9 Oct 2018 23:28:33 +0200 Subject: [PATCH] Changed debug message file locations to StORMDebug.location --- Sources/Convenience.swift | 12 ++++++------ Sources/Delete.swift | 6 +++--- Sources/Insert.swift | 8 ++++---- Sources/PostgresConnect.swift | 8 ++++---- Sources/PostgresStORM.swift | 18 +++++++++--------- Sources/SQL.swift | 4 ++-- Sources/Select.swift | 2 +- Sources/Update.swift | 4 ++-- Sources/Upsert.swift | 2 +- 9 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Sources/Convenience.swift b/Sources/Convenience.swift index e9f9ef7..8be0303 100644 --- a/Sources/Convenience.swift +++ b/Sources/Convenience.swift @@ -20,7 +20,7 @@ extension PostgresStORM { do { try exec(deleteSQL(self.table(), idName: idname.lowercased()), params: [String(describing: idval)]) } catch { - LogFile.error("Error: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error: \(error)", logFile: StORMDebug.location) self.error = StORMError.error("\(error)") throw error } @@ -32,7 +32,7 @@ extension PostgresStORM { do { try exec(deleteSQL(self.table(), idName: idname.lowercased()), params: [String(describing: id)]) } catch { - LogFile.error("Error: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error: \(error)", logFile: StORMDebug.location) self.error = StORMError.error("\(error)") throw error } @@ -44,7 +44,7 @@ extension PostgresStORM { do { try select(whereclause: "\"\(idname.lowercased())\" = $1", params: [id], orderby: []) } catch { - LogFile.error("Error: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error: \(error)", logFile: StORMDebug.location) throw error } } @@ -55,7 +55,7 @@ extension PostgresStORM { do { try select(whereclause: "\"\(idname.lowercased())\" = $1", params: ["\(idval)"], orderby: []) } catch { - LogFile.error("Error: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error: \(error)", logFile: StORMDebug.location) throw error } } @@ -76,7 +76,7 @@ extension PostgresStORM { do { try select(whereclause: set.joined(separator: " AND "), params: paramsString, orderby: [idname], cursor: cursor) } catch { - LogFile.error("Error: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error: \(error)", logFile: StORMDebug.location) throw error } @@ -101,7 +101,7 @@ extension PostgresStORM { do { try select(whereclause: set.joined(separator: " AND "), params: paramsString, orderby: [idname], cursor: cursor) } catch { - LogFile.error("Error: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error: \(error)", logFile: StORMDebug.location) throw error } diff --git a/Sources/Delete.swift b/Sources/Delete.swift index 4b1d822..2fd0581 100644 --- a/Sources/Delete.swift +++ b/Sources/Delete.swift @@ -23,7 +23,7 @@ extension PostgresStORM { do { try exec(deleteSQL(self.table(), idName: idName), params: [String(id)]) } catch { - LogFile.error("Error: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error: \(error)", logFile: StORMDebug.location) self.error = StORMError.error("\(error)") throw error } @@ -36,7 +36,7 @@ extension PostgresStORM { do { try exec(deleteSQL(self.table(), idName: idName), params: [id]) } catch { - LogFile.error("Error: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error: \(error)", logFile: StORMDebug.location) self.error = StORMError.error("\(error)") throw error } @@ -49,7 +49,7 @@ extension PostgresStORM { do { try exec(deleteSQL(self.table(), idName: idName), params: [id.string]) } catch { - LogFile.error("Error: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error: \(error)", logFile: StORMDebug.location) self.error = StORMError.error("\(error)") throw error } diff --git a/Sources/Insert.swift b/Sources/Insert.swift index f252789..d6a2f24 100644 --- a/Sources/Insert.swift +++ b/Sources/Insert.swift @@ -25,7 +25,7 @@ extension PostgresStORM { do { return try insert(cols: keys, params: vals) } catch { - LogFile.error("Error: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error: \(error)", logFile: StORMDebug.location) throw StORMError.error("\(error)") } } @@ -43,7 +43,7 @@ extension PostgresStORM { do { return try insert(cols: keys, params: vals) } catch { - LogFile.error("Error: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error: \(error)", logFile: StORMDebug.location) throw StORMError.error("\(error)") } } @@ -55,7 +55,7 @@ extension PostgresStORM { do { return try insert(cols: cols, params: params, idcolumn: idname) } catch { - LogFile.error("Error: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error: \(error)", logFile: StORMDebug.location) throw StORMError.error("\(error)") } } @@ -80,7 +80,7 @@ extension PostgresStORM { let response = try exec(str, params: paramString) return parseRows(response)[0].data[idcolumn.lowercased()]! } catch { - LogFile.error("Error: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error: \(error)", logFile: StORMDebug.location) self.error = StORMError.error("\(error)") throw error } diff --git a/Sources/PostgresConnect.swift b/Sources/PostgresConnect.swift index 523e84b..e35a664 100644 --- a/Sources/PostgresConnect.swift +++ b/Sources/PostgresConnect.swift @@ -44,20 +44,20 @@ open class PostgresConnect: StORMConnect { // Connection String private func connectionString() -> String { let conn = "postgresql://\(credentials.username.stringByEncodingURL):\(credentials.password.stringByEncodingURL)@\(credentials.host.stringByEncodingURL):\(credentials.port)/\(database.stringByEncodingURL)" - if StORMdebug { LogFile.info("Postgres conn: \(conn)", logFile: "./StORMlog.txt") } + if StORMDebug.active { LogFile.info("Postgres conn: \(conn)", logFile: StORMDebug.location) } return conn } /// Opens the connection - /// If StORMdebug is true, the connection state will be output to console and to ./StORMlog.txt + /// If StORMDebug.active is true, the connection state will be output to console and to StORMDebug.location public func open() { let status = server.connectdb(self.connectionString()) if status != .ok { state = .bad resultCode = .error("\(server.errorMessage())") - if StORMdebug { LogFile.error("Postgres conn error: \(server.errorMessage())", logFile: "./StORMlog.txt") } + if StORMDebug.active { LogFile.error("Postgres conn error: \(server.errorMessage())", logFile: StORMDebug.location) } } else { - if StORMdebug { LogFile.info("Postgres conn state: ok", logFile: "./StORMlog.txt") } + if StORMDebug.active { LogFile.info("Postgres conn state: ok", logFile: StORMDebug.location) } resultCode = .noError } } diff --git a/Sources/PostgresStORM.swift b/Sources/PostgresStORM.swift index 149915f..e98d76d 100644 --- a/Sources/PostgresStORM.swift +++ b/Sources/PostgresStORM.swift @@ -47,7 +47,7 @@ open class PostgresStORM: StORM, StORMProtocol { } private func printDebug(_ statement: String, _ params: [String]) { - if StORMdebug { LogFile.debug("StORM Debug: \(statement) : \(params.joined(separator: ", "))", logFile: "./StORMlog.txt") } + if StORMDebug.active { LogFile.debug("StORM Debug: \(statement) : \(params.joined(separator: ", "))", logFile: StORMDebug.location) } } // Internal function which executes statements, with parameter binding @@ -74,7 +74,7 @@ open class PostgresStORM: StORM, StORMProtocol { // set exec message errorMsg = thisConnection.server.errorMessage().trimmingCharacters(in: .whitespacesAndNewlines) - if StORMdebug { LogFile.info("Error msg: \(errorMsg)", logFile: "./StORMlog.txt") } + if StORMDebug.active { LogFile.info("Error msg: \(errorMsg)", logFile: StORMDebug.location) } if isError() { thisConnection.server.close() throw StORMError.error(errorMsg) @@ -107,7 +107,7 @@ open class PostgresStORM: StORM, StORMProtocol { // set exec message errorMsg = thisConnection.server.errorMessage().trimmingCharacters(in: .whitespacesAndNewlines) - if StORMdebug { LogFile.info("Error msg: \(errorMsg)", logFile: "./StORMlog.txt") } + if StORMDebug.active { LogFile.info("Error msg: \(errorMsg)", logFile: StORMDebug.location) } if isError() { thisConnection.server.close() throw StORMError.error(errorMsg) @@ -163,7 +163,7 @@ open class PostgresStORM: StORM, StORMProtocol { try update(data: asData(1), idName: idname, idValue: idval) } } catch { - LogFile.error("Error: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error: \(error)", logFile: StORMDebug.location) throw StORMError.error("\(error)") } } @@ -184,7 +184,7 @@ open class PostgresStORM: StORM, StORMProtocol { try update(data: asData(1), idName: idname, idValue: idval) } } catch { - LogFile.error("Error: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error: \(error)", logFile: StORMDebug.location) throw StORMError.error("\(error)") } } @@ -195,7 +195,7 @@ open class PostgresStORM: StORM, StORMProtocol { do { try insert(asData()) } catch { - LogFile.error("Error: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error: \(error)", logFile: StORMDebug.location) throw StORMError.error("\(error)") } } @@ -211,7 +211,7 @@ open class PostgresStORM: StORM, StORMProtocol { /// Requires the connection to be configured, as well as a valid "table" property to have been set in the class open func setup(_ str: String = "") throws { - LogFile.info("Running setup: \(table())", logFile: "./StORMlog.txt") + LogFile.info("Running setup: \(table())", logFile: StORMDebug.location) var createStatement = str if str.count == 0 { var opt = [String]() @@ -251,13 +251,13 @@ open class PostgresStORM: StORM, StORMProtocol { let keyComponent = ", CONSTRAINT \(table())_key PRIMARY KEY (\(keyName)) NOT DEFERRABLE INITIALLY IMMEDIATE" createStatement = "CREATE TABLE IF NOT EXISTS \(table()) (\(opt.joined(separator: ", "))\(keyComponent));" - if StORMdebug { LogFile.info("createStatement: \(createStatement)", logFile: "./StORMlog.txt") } + if StORMDebug.active { LogFile.info("createStatement: \(createStatement)", logFile: StORMDebug.location) } } do { try sql(createStatement, params: []) } catch { - LogFile.error("Error msg: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error msg: \(error)", logFile: StORMDebug.location) throw StORMError.error("\(error)") } } diff --git a/Sources/SQL.swift b/Sources/SQL.swift index a6a0244..509ced7 100644 --- a/Sources/SQL.swift +++ b/Sources/SQL.swift @@ -21,7 +21,7 @@ extension PostgresStORM { return try exec(statement, params: params) } catch { if !PostgresConnector.quiet { - LogFile.error("Error msg: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error msg: \(error)", logFile: StORMDebug.location) self.error = StORMError.error("\(error)") } throw error @@ -36,7 +36,7 @@ extension PostgresStORM { return try execRows(statement, params: params) } catch { if !PostgresConnector.quiet { - LogFile.error("Error msg: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error msg: \(error)", logFile: StORMDebug.location) self.error = StORMError.error("\(error)") } throw error diff --git a/Sources/Select.swift b/Sources/Select.swift index 39b37ab..109daad 100644 --- a/Sources/Select.swift +++ b/Sources/Select.swift @@ -145,7 +145,7 @@ extension PostgresStORM { //return results } catch { - LogFile.error("Error msg: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error msg: \(error)", logFile: StORMDebug.location) self.error = StORMError.error("\(error)") throw error } diff --git a/Sources/Update.swift b/Sources/Update.swift index d0b9d8b..5983cff 100644 --- a/Sources/Update.swift +++ b/Sources/Update.swift @@ -31,7 +31,7 @@ extension PostgresStORM { do { try exec(str, params: paramsString) } catch { - LogFile.error("Error msg: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error msg: \(error)", logFile: StORMDebug.location) self.error = StORMError.error("\(error)") throw error } @@ -54,7 +54,7 @@ extension PostgresStORM { do { return try update(cols: keys, params: vals, idName: idName, idValue: idValue) } catch { - LogFile.error("Error msg: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error msg: \(error)", logFile: StORMDebug.location) throw StORMError.error("\(error)") } } diff --git a/Sources/Upsert.swift b/Sources/Upsert.swift index d12f5b6..300c8f6 100644 --- a/Sources/Upsert.swift +++ b/Sources/Upsert.swift @@ -33,7 +33,7 @@ extension PostgresStORM { do { try exec(str, params: paramsString) } catch { - LogFile.error("Error msg: \(error)", logFile: "./StORMlog.txt") + LogFile.error("Error msg: \(error)", logFile: StORMDebug.location) self.error = StORMError.error("\(error)") throw error }