diff --git a/docs/schema-clear.sql b/docs/schema-clear.sql index cec4744d..33e1ab28 100644 --- a/docs/schema-clear.sql +++ b/docs/schema-clear.sql @@ -17,7 +17,6 @@ DROP TABLE IF EXISTS archivetypes; DROP TABLE IF EXISTS win_builds; DROP TABLE IF EXISTS maven_builds; DROP TABLE IF EXISTS build_notifications; -DROP TABLE IF EXISTS log_messages; DROP TABLE IF EXISTS buildroot_listing; DROP TABLE IF EXISTS rpmsigs; DROP TABLE IF EXISTS rpminfo; diff --git a/docs/schema-upgrade-1.13-1.14.sql b/docs/schema-upgrade-1.13-1.14.sql new file mode 100644 index 00000000..acd2e0a4 --- /dev/null +++ b/docs/schema-upgrade-1.13-1.14.sql @@ -0,0 +1,9 @@ +-- upgrade script to migrate the Koji database schema +-- from version 1.13 to 1.14 + +BEGIN; + +-- drop unused log_messages table +DROP TABLE log_messages; + +COMMIT; diff --git a/docs/schema.sql b/docs/schema.sql index fc081a75..80e14224 100644 --- a/docs/schema.sql +++ b/docs/schema.sql @@ -685,16 +685,6 @@ CREATE TABLE buildroot_listing ( ) WITHOUT OIDS; CREATE INDEX buildroot_listing_rpms ON buildroot_listing(rpm_id); -CREATE TABLE log_messages ( - id SERIAL NOT NULL PRIMARY KEY, - message TEXT NOT NULL, - message_time TIMESTAMP NOT NULL DEFAULT NOW(), - logger_name VARCHAR(200) NOT NULL, - level VARCHAR(10) NOT NULL, - location VARCHAR(200), - host VARCHAR(200) -) WITHOUT OIDS; - CREATE TABLE build_notifications ( id SERIAL NOT NULL PRIMARY KEY, user_id INTEGER NOT NULL REFERENCES users (id), diff --git a/koji/__init__.py b/koji/__init__.py index 2b9fe243..835d96a1 100644 --- a/koji/__init__.py +++ b/koji/__init__.py @@ -3025,17 +3025,5 @@ def add_mail_logger(logger, addr): handler.setLevel(logging.ERROR) logging.getLogger(logger).addHandler(handler) -def add_db_logger(logger, cnx): - handler = DBHandler(cnx, "log_messages", {'message': '%(message)s', - 'message_time': '%(asctime)s', - 'logger_name': '%(name)s', - 'level': '%(levelname)s', - 'location': '%(pathname)s:%(lineno)d', - 'host': socket.getfqdn(), - }) - handler.setFormatter(logging.Formatter(datefmt='%Y-%m-%d %H:%M:%S')) - logging.getLogger(logger).addHandler(handler) - return handler - def remove_log_handler(logger, handler): logging.getLogger(logger).removeHandler(handler)