Implement Logger and use it instead of glog - Issue #6

bndNil.go

@@ -56,5 +56,5 @@ func (bnd *bndNil) close() (err error) {
 	bnd.stmt = nil
 	bnd.ocibnd = nil
 	stmt.putBnd(bndIdxNil, bnd)
-return nil
+	return nil
 }

bndRset.go

@@ -79,5 +79,5 @@ func (bnd *bndRset) close() (err error) {
 	bnd.ocistmt = nil
 	bnd.value = nil
 	stmt.putBnd(bndIdxRset, bnd)
-return nil
+	return nil
 }

bndTimePtr.go

@@ -84,5 +84,5 @@ func (bnd *bndTimePtr) close() (err error) {
 	bnd.ociDateTime = nil
 	bnd.value = nil
 	stmt.putBnd(bndIdxTimePtr, bnd)
-return nil
+	return nil
 }

bndUint16.go

@@ -64,5 +64,5 @@ func (bnd *bndUint16) close() (err error) {
 	bnd.stmt = nil
 	bnd.ocibnd = nil
 	stmt.putBnd(bndIdxUint16, bnd)
-return nil
+	return nil
 }

bndUint16Ptr.go

@@ -70,5 +70,5 @@ func (bnd *bndUint16Ptr) close() (err error) {
 	bnd.ocibnd = nil
 	bnd.value = nil
 	stmt.putBnd(bndIdxUint16Ptr, bnd)
-return nil
+	return nil
 }

bndUint16Slice.go

@@ -97,5 +97,5 @@ func (bnd *bndUint16Slice) close() (err error) {
 	bnd.ocibnd = nil
 	bnd.ociNumbers = nil
 	stmt.putBnd(bndIdxUint16Slice, bnd)
-return nil
+	return nil
 }

bndUint32.go

@@ -64,5 +64,5 @@ func (bnd *bndUint32) close() (err error) {
 	bnd.stmt = nil
 	bnd.ocibnd = nil
 	stmt.putBnd(bndIdxUint32, bnd)
-return nil
+	return nil
 }

bndUint32Ptr.go

@@ -70,5 +70,5 @@ func (bnd *bndUint32Ptr) close() (err error) {
 	bnd.ocibnd = nil
 	bnd.value = nil
 	stmt.putBnd(bndIdxUint32Ptr, bnd)
-return nil
+	return nil
 }

bndUint32Slice.go

@@ -97,5 +97,5 @@ func (bnd *bndUint32Slice) close() (err error) {
 	bnd.ocibnd = nil
 	bnd.ociNumbers = nil
 	stmt.putBnd(bndIdxUint32Slice, bnd)
-return nil
+	return nil
 }

bndUint64Ptr.go

@@ -70,5 +70,5 @@ func (bnd *bndUint64Ptr) close() (err error) {
 	bnd.ocibnd = nil
 	bnd.value = nil
 	stmt.putBnd(bndIdxUint64Ptr, bnd)
-return nil
+	return nil
 }

bndUint64Slice.go

@@ -97,5 +97,5 @@ func (bnd *bndUint64Slice) close() (err error) {
 	bnd.ocibnd = nil
 	bnd.ociNumbers = nil
 	stmt.putBnd(bndIdxUint64Slice, bnd)
-return nil
+	return nil
 }

bndUint8Ptr.go

@@ -70,5 +70,5 @@ func (bnd *bndUint8Ptr) close() (err error) {
 	bnd.ocibnd = nil
 	bnd.value = nil
 	stmt.putBnd(bndIdxUint8Ptr, bnd)
-return nil
+	return nil
 }

bndUint8Slice.go

@@ -97,5 +97,5 @@ func (bnd *bndUint8Slice) close() (err error) {
 	bnd.ocibnd = nil
 	bnd.ociNumbers = nil
 	stmt.putBnd(bndIdxUint8Slice, bnd)
-return nil
+	return nil
 }

conn.go

@@ -7,7 +7,6 @@ package ora
 import (
 	"container/list"
 	"database/sql/driver"
-	"github.com/golang/glog"
 )
 
 // Con is an Oracle connection associated with a server and session.
@@ -47,10 +46,10 @@ func (con *Con) Close() (err error) {
 	if err := con.checkIsOpen(); err != nil {
 		return err
 	}
-	glog.Infof("E%vC%v] Close", con.env.id, con.id)
+	Log.Infof("E%vC%v] Close", con.env.id, con.id)
 	defer func() {
 		if value := recover(); value != nil {
-			glog.Errorln(recoverMsg(value))
+			Log.Errorln(recoverMsg(value))
 			err = errRecover(value)
 		}
 
@@ -79,7 +78,7 @@ func (con *Con) Prepare(sql string) (driver.Stmt, error) {
 	if err := con.checkIsOpen(); err != nil {
 		return nil, err
 	}
-	glog.Infof("E%vC%v] Prepare", con.env.id, con.id)
+	Log.Infof("E%vC%v] Prepare", con.env.id, con.id)
 	stmt, err := con.ses.Prep(sql)
 	if err != nil {
 		return nil, err
@@ -94,7 +93,7 @@ func (con *Con) Begin() (driver.Tx, error) {
 	if err := con.checkIsOpen(); err != nil {
 		return nil, err
 	}
-	glog.Infof("E%vC%v] Begin", con.env.id, con.id)
+	Log.Infof("E%vC%v] Begin", con.env.id, con.id)
 	tx, err := con.ses.StartTx()
 	if err != nil {
 		return nil, err
@@ -107,6 +106,6 @@ func (con *Con) Ping() error {
 	if err := con.checkIsOpen(); err != nil {
 		return err
 	}
-	glog.Infof("E%vC%v] Ping", con.env.id, con.id)
+	Log.Infof("E%vC%v] Ping", con.env.id, con.id)
 	return con.srv.Ping()
 }

defBfile.go

@@ -24,7 +24,7 @@ type defBfile struct {
 func (def *defBfile) define(position int, rset *Rset) error {
 	def.rset = rset
 	r := C.OCIDefineByPos2(
-		def.rset.ocistmt,                   //OCIStmt     *stmtp,
+		def.rset.ocistmt,                        //OCIStmt     *stmtp,
 		&def.ocidef,                             //OCIDefine   **defnpp,
 		def.rset.stmt.ses.srv.env.ocierr,        //OCIError    *errhp,
 		C.ub4(position),                         //ub4         position,
@@ -109,5 +109,5 @@ func (def *defBfile) close() (err error) {
 	def.ocidef = nil
 	def.ociLobLocator = nil
 	rset.putDef(defIdxBfile, def)
-return nil
+	return nil
 }

defFloat32.go

@@ -24,7 +24,7 @@ func (def *defFloat32) define(position int, isNullable bool, rset *Rset) error {
 	def.rset = rset
 	def.isNullable = isNullable
 	r := C.OCIDefineByPos2(
-		def.rset.ocistmt,            //OCIStmt     *stmtp,
+		def.rset.ocistmt,                 //OCIStmt     *stmtp,
 		&def.ocidef,                      //OCIDefine   **defnpp,
 		def.rset.stmt.ses.srv.env.ocierr, //OCIError    *errhp,
 		C.ub4(position),                  //ub4         position,

defFloat64.go

@@ -24,7 +24,7 @@ func (def *defFloat64) define(position int, isNullable bool, rset *Rset) error {
 	def.rset = rset
 	def.isNullable = isNullable
 	r := C.OCIDefineByPos2(
-		def.rset.ocistmt,            //OCIStmt     *stmtp,
+		def.rset.ocistmt,                 //OCIStmt     *stmtp,
 		&def.ocidef,                      //OCIDefine   **defnpp,
 		def.rset.stmt.ses.srv.env.ocierr, //OCIError    *errhp,
 		C.ub4(position),                  //ub4         position,

defInt16.go

@@ -24,7 +24,7 @@ func (def *defInt16) define(position int, isNullable bool, rset *Rset) error {
 	def.rset = rset
 	def.isNullable = isNullable
 	r := C.OCIDefineByPos2(
-		def.rset.ocistmt,            //OCIStmt     *stmtp,
+		def.rset.ocistmt,                 //OCIStmt     *stmtp,
 		&def.ocidef,                      //OCIDefine   **defnpp,
 		def.rset.stmt.ses.srv.env.ocierr, //OCIError    *errhp,
 		C.ub4(position),                  //ub4         position,
@@ -93,5 +93,5 @@ func (def *defInt16) close() (err error) {
 	def.rset = nil
 	def.ocidef = nil
 	rset.putDef(defIdxInt16, def)
-return nil
+	return nil
 }

defInt32.go

@@ -24,7 +24,7 @@ func (def *defInt32) define(position int, isNullable bool, rset *Rset) error {
 	def.rset = rset
 	def.isNullable = isNullable
 	r := C.OCIDefineByPos2(
-		def.rset.ocistmt,            //OCIStmt     *stmtp,
+		def.rset.ocistmt,                 //OCIStmt     *stmtp,
 		&def.ocidef,                      //OCIDefine   **defnpp,
 		def.rset.stmt.ses.srv.env.ocierr, //OCIError    *errhp,
 		C.ub4(position),                  //ub4         position,
@@ -93,5 +93,5 @@ func (def *defInt32) close() (err error) {
 	def.rset = nil
 	def.ocidef = nil
 	rset.putDef(defIdxInt32, def)
-return nil
+	return nil
 }

defInt64.go

@@ -24,7 +24,7 @@ func (def *defInt64) define(position int, isNullable bool, rset *Rset) error {
 	def.rset = rset
 	def.isNullable = isNullable
 	r := C.OCIDefineByPos2(
-		def.rset.ocistmt,            //OCIStmt     *stmtp,
+		def.rset.ocistmt,                 //OCIStmt     *stmtp,
 		&def.ocidef,                      //OCIDefine   **defnpp,
 		def.rset.stmt.ses.srv.env.ocierr, //OCIError    *errhp,
 		C.ub4(position),                  //ub4         position,

defInt8.go

@@ -24,7 +24,7 @@ func (def *defInt8) define(position int, isNullable bool, rset *Rset) error {
 	def.rset = rset
 	def.isNullable = isNullable
 	r := C.OCIDefineByPos2(
-		def.rset.ocistmt,            //OCIStmt     *stmtp,
+		def.rset.ocistmt,                 //OCIStmt     *stmtp,
 		&def.ocidef,                      //OCIDefine   **defnpp,
 		def.rset.stmt.ses.srv.env.ocierr, //OCIError    *errhp,
 		C.ub4(position),                  //ub4         position,

defRowid.go

@@ -73,5 +73,5 @@ func (def *defRowid) close() (err error) {
 	def.ocidef = nil
 	clear(def.buf, 32)
 	rset.putDef(defIdxRowid, def)
-return nil
+	return nil
 }

defUint32.go

@@ -24,7 +24,7 @@ func (def *defUint32) define(position int, isNullable bool, rset *Rset) error {
 	def.rset = rset
 	def.isNullable = isNullable
 	r := C.OCIDefineByPos2(
-		def.rset.ocistmt,            //OCIStmt     *stmtp,
+		def.rset.ocistmt,                 //OCIStmt     *stmtp,
 		&def.ocidef,                      //OCIDefine   **defnpp,
 		def.rset.stmt.ses.srv.env.ocierr, //OCIError    *errhp,
 		C.ub4(position),                  //ub4         position,
@@ -93,5 +93,5 @@ func (def *defUint32) close() (err error) {
 	def.rset = nil
 	def.ocidef = nil
 	rset.putDef(defIdxUint32, def)
-return nil
+	return nil
 }

drv.go

@@ -15,7 +15,6 @@ import (
 	"database/sql/driver"
 	"errors"
 	"fmt"
-	"github.com/golang/glog"
 	"sync"
 	"time"
 )
@@ -382,7 +381,7 @@ func GetDrv() *Drv {
 		var err error
 		_drv.sqlEnv, err = _drv.OpenEnv()
 		if err != nil {
-			glog.Errorln("GetDrv: ", err)
+			Log.Errorln("GetDrv: ", err)
 		}
 		_drv.sqlEnv.isSqlPkg = true
 		_drv.sqlEnv.stmtCfg.Rset.binaryFloat = F64
@@ -403,7 +402,7 @@ func (drv *Drv) OpenEnv() (*Env, error) {
 		drv.envId++
 		env.id = drv.envId
 	}
-	glog.Infof("OpenEnv %v", env.id)
+	Log.Infof("OpenEnv %v", env.id)
 
 	// OCI_DEFAULT  - The default value, which is non-UTF-16 encoding.
 	// OCI_THREADED - Uses threaded environment. Internal data structures not exposed to the user are protected from concurrent accesses by multiple threads.
@@ -445,7 +444,7 @@ func (drv *Drv) OpenEnv() (*Env, error) {
 //
 // Open is a member of the driver.Driver interface.
 func (drv *Drv) Open(conStr string) (driver.Conn, error) {
-	glog.Infoln("Open")
+	Log.Infoln("Open")
 	con, err := drv.sqlEnv.OpenCon(conStr)
 	if err != nil {
 		return nil, err

drvStmt.go

@@ -4,10 +4,7 @@
 
 package ora
 
-import (
-	"database/sql/driver"
-	"github.com/golang/glog"
-)
+import "database/sql/driver"
 
 // DrvStmt is an Oracle statement associated with a session.
 //
@@ -33,7 +30,7 @@ func (ds *DrvStmt) Close() error {
 	if err := ds.checkIsOpen(); err != nil {
 		return err
 	}
-	glog.Infof("E%vS%vS%vS%v] Close", ds.stmt.ses.srv.env.id, ds.stmt.ses.srv.id, ds.stmt.ses.id, ds.stmt.id)
+	Log.Infof("E%vS%vS%vS%v] Close", ds.stmt.ses.srv.env.id, ds.stmt.ses.srv.id, ds.stmt.ses.id, ds.stmt.id)
 	return ds.stmt.Close()
 }
 
@@ -55,7 +52,7 @@ func (ds *DrvStmt) Exec(values []driver.Value) (result driver.Result, err error)
 	if err := ds.checkIsOpen(); err != nil {
 		return nil, err
 	}
-	glog.Infof("E%vS%vS%vS%v] Exec", ds.stmt.ses.srv.env.id, ds.stmt.ses.srv.id, ds.stmt.ses.id, ds.stmt.id)
+	Log.Infof("E%vS%vS%vS%v] Exec", ds.stmt.ses.srv.env.id, ds.stmt.ses.srv.id, ds.stmt.ses.id, ds.stmt.id)
 	params := make([]interface{}, len(values))
 	for n, _ := range values {
 		params[n] = values[n]
@@ -77,7 +74,7 @@ func (ds *DrvStmt) Query(values []driver.Value) (driver.Rows, error) {
 	if err := ds.checkIsOpen(); err != nil {
 		return nil, err
 	}
-	glog.Infof("E%vS%vS%vS%v] Query", ds.stmt.ses.srv.env.id, ds.stmt.ses.srv.id, ds.stmt.ses.id, ds.stmt.id)
+	Log.Infof("E%vS%vS%vS%v] Query", ds.stmt.ses.srv.env.id, ds.stmt.ses.srv.id, ds.stmt.ses.id, ds.stmt.id)
 	params := make([]interface{}, len(values))
 	for n, _ := range values {
 		params[n] = values[n]

env.go

@@ -12,7 +12,6 @@ import "C"
 import (
 	"container/list"
 	"fmt"
-	"github.com/golang/glog"
 	"strings"
 	"unsafe"
 )
@@ -66,11 +65,11 @@ func (env *Env) Close() (err error) {
 	if err := env.checkIsOpen(); err != nil {
 		return err
 	}
-	glog.Infof("E%v] Close", env.id)
+	Log.Infof("E%v] Close", env.id)
 	errs := env.drv.listPool.Get().(*list.List)
 	defer func() {
 		if value := recover(); value != nil {
-			glog.Errorln(recoverMsg(value))
+			Log.Errorln(recoverMsg(value))
 			errs.PushBack(errRecover(value))
 		}
 
@@ -113,7 +112,7 @@ func (env *Env) OpenSrv(dbname string) (*Srv, error) {
 	if err := env.checkIsOpen(); err != nil {
 		return nil, err
 	}
-	glog.Infof("E%v] OpenSrv (dbname %v)", env.id, dbname)
+	Log.Infof("E%v] OpenSrv (dbname %v)", env.id, dbname)
 	// allocate server handle
 	ocisrv, err := env.allocOciHandle(C.OCI_HTYPE_SERVER)
 	if err != nil {
@@ -148,7 +147,7 @@ func (env *Env) OpenSrv(dbname string) (*Srv, error) {
 		env.srvId++
 		srv.id = env.srvId
 	}
-	glog.Infof("E%v] OpenSrv (srvId %v)", env.id, srv.id)
+	Log.Infof("E%v] OpenSrv (srvId %v)", env.id, srv.id)
 	srv.env = env
 	srv.ocisrv = (*C.OCIServer)(ocisrv)
 	srv.ocisvcctx = (*C.OCISvcCtx)(ocisvcctx)
@@ -168,7 +167,7 @@ func (env *Env) OpenCon(str string) (*Con, error) {
 	if err := env.checkIsOpen(); err != nil {
 		return nil, err
 	}
-	glog.Infof("E%v] OpenCon", env.id)
+	Log.Infof("E%v] OpenCon", env.id)
 	// parse connection string
 	var username string
 	var password string
@@ -177,7 +176,7 @@ func (env *Env) OpenCon(str string) (*Con, error) {
 	str = strings.Replace(str, "/", " / ", 1)
 	str = strings.Replace(str, "@", " @ ", 1)
 	_, err := fmt.Sscanf(str, "%s / %s @ %s", &username, &password, &dbname)
-	glog.Infof("E%v] OpenCon (dbname %v, username %v)", env.id, dbname, username)
+	Log.Infof("E%v] OpenCon (dbname %v, username %v)", env.id, dbname, username)
 	if err != nil {
 		return nil, err
 	}
@@ -197,7 +196,7 @@ func (env *Env) OpenCon(str string) (*Con, error) {
 		env.conId++
 		con.id = env.conId
 	}
-	glog.Infof("E%v] OpenCon (conId %v)", env.id, con.id)
+	Log.Infof("E%v] OpenCon (conId %v)", env.id, con.id)
 	con.env = env
 	con.srv = srv
 	con.ses = ses