From 489cde8eb0e19ef6fe8078148199eaf5b52631ae Mon Sep 17 00:00:00 2001 From: Lianhao Lu Date: Tue, 10 Jan 2012 14:13:50 +0800 Subject: bitbake: Automatically start local PR service. [YOCTO #1126] A local PR service will be started and stopped automatically along with the bitbake invocation/ternimation. This local PR service will be started only and if only when the PRSERV_HOST is set to 'localhost' and PRSERV_PORT is set to '0'. When started, the sqlite3 database is stored at "${PERSISTEN_DIR}/prserv.sqlite3" or "${CACHE}/prserv.sqlite3". (Bitbake rev: 9d8f45407c67ed0d3c4f820cf646de3c385067c7) Signed-off-by: Lianhao Lu Signed-off-by: Richard Purdie --- bitbake/lib/prserv/db.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'bitbake/lib/prserv/db.py') diff --git a/bitbake/lib/prserv/db.py b/bitbake/lib/prserv/db.py index f267daed13..9d8e9db9f2 100644 --- a/bitbake/lib/prserv/db.py +++ b/bitbake/lib/prserv/db.py @@ -8,6 +8,8 @@ try: except ImportError: from pysqlite2 import dbapi2 as sqlite3 +logger = logging.getLogger("BitBake.PRserv") + sqlversion = sqlite3.sqlite_version_info if sqlversion[0] < 3 or (sqlversion[0] == 3 and sqlversion[1] < 3): raise Exception("sqlite3 version 3.3.0 or later is required.") @@ -55,7 +57,7 @@ class PRTable(): (version,pkgarch, checksum,version, pkgarch)) self.conn.commit() except sqlite3.IntegrityError as exc: - logging.error(str(exc)) + logger.error(str(exc)) data=self._execute("SELECT value FROM %s WHERE version=? AND pkgarch=? AND checksum=?;" % self.table, (version, pkgarch, checksum)) @@ -83,7 +85,7 @@ class PRTable(): (version, pkgarch, checksum, version, pkgarch)) self.conn.commit() except sqlite3.IntegrityError as exc: - logging.error(str(exc)) + logger.error(str(exc)) self.conn.rollback() data=self._execute("SELECT value FROM %s WHERE version=? AND pkgarch=? AND checksum=?;" % self.table, @@ -115,7 +117,7 @@ class PRTable(): (version, pkgarch, checksum, value)) self.conn.commit() except sqlite3.IntegrityError as exc: - logging.error(str(exc)) + logger.error(str(exc)) data = self._execute("SELECT value FROM %s WHERE version=? AND pkgarch=? AND checksum=?;" % self.table, (version, pkgarch, checksum)) @@ -140,7 +142,7 @@ class PRTable(): (value,version,pkgarch,checksum,value)) self.conn.commit() except sqlite3.IntegrityError as exc: - logging.error(str(exc)) + logger.error(str(exc)) data = self._execute("SELECT value FROM %s WHERE version=? AND pkgarch=? AND checksum=? AND value>=?;" % self.table, (version,pkgarch,checksum,value)) @@ -241,5 +243,5 @@ class PRData(object): def __delitem__(self, tblname): if tblname in self._tables: del self._tables[tblname] - logging.info("drop table %s" % (tblname)) + logger.info("drop table %s" % (tblname)) self.connection.execute("DROP TABLE IF EXISTS %s;" % tblname) -- cgit v1.2.3-54-g00ecf