Add Debian deployment, MariaDB storage and randomized proxy routing
This commit is contained in:
+7
-3
@@ -22,7 +22,7 @@ CREATE INDEX IF NOT EXISTS catalog_filter ON catalog(year,province,major_code,sc
|
||||
""" + SCORE_SCHEMA + """
|
||||
CREATE INDEX IF NOT EXISTS scores_lookup ON scores(school_code,major_code,year DESC);
|
||||
CREATE TABLE IF NOT EXISTS schools(school_code TEXT PRIMARY KEY, school_name TEXT, province TEXT, level TEXT, data TEXT);
|
||||
CREATE TABLE IF NOT EXISTS jobs(id TEXT PRIMARY KEY, params TEXT, status TEXT, created_at TEXT, updated_at TEXT, message TEXT, errors INTEGER DEFAULT 0, records INTEGER DEFAULT 0);
|
||||
CREATE TABLE IF NOT EXISTS jobs(id TEXT PRIMARY KEY, params TEXT, status TEXT, created_at TEXT, updated_at TEXT, message TEXT, errors INTEGER DEFAULT 0, records INTEGER DEFAULT 0,resume_pending INTEGER DEFAULT 0);
|
||||
CREATE TABLE IF NOT EXISTS job_units(job_id TEXT, unit TEXT, PRIMARY KEY(job_id,unit));
|
||||
CREATE TABLE IF NOT EXISTS job_logs(id INTEGER PRIMARY KEY,job_id TEXT,created_at TEXT,level TEXT,message TEXT);
|
||||
"""
|
||||
@@ -45,7 +45,11 @@ class Database:
|
||||
conn.execute('DROP TABLE scores')
|
||||
conn.execute('ALTER TABLE scores_new RENAME TO scores')
|
||||
conn.execute('CREATE INDEX scores_lookup ON scores(school_code,major_code,year DESC)')
|
||||
conn.execute("UPDATE jobs SET status='paused',message='服务重启,任务可从断点恢复' WHERE status IN ('running','queued')")
|
||||
if 'resume_pending' not in {row['name'] for row in conn.execute('PRAGMA table_info(jobs)')}:
|
||||
conn.execute('ALTER TABLE jobs ADD COLUMN resume_pending INTEGER DEFAULT 0')
|
||||
recovery = "status IN ('running','queued') OR (status='paused' AND resume_pending=1)"
|
||||
self.recovered_job_ids = [row['id'] for row in conn.execute('SELECT id FROM jobs WHERE ' + recovery)]
|
||||
conn.execute("UPDATE jobs SET status='paused',resume_pending=0,message='服务重启,任务可从断点恢复' WHERE " + recovery)
|
||||
|
||||
@contextmanager
|
||||
def connection(self):
|
||||
@@ -182,7 +186,7 @@ class Database:
|
||||
conn.execute("INSERT INTO jobs(id,params,status,created_at,updated_at,message) VALUES(?,?,'queued',?,?,?)",(jid,encode(params),now(),now(),"等待开始"))
|
||||
|
||||
def job_update(self, jid, **changes):
|
||||
allowed = {"status","message","errors","records"}
|
||||
allowed = {"status","message","errors","records","resume_pending"}
|
||||
changes = {key:value for key,value in changes.items() if key in allowed}
|
||||
changes["updated_at"] = now()
|
||||
with self.connection() as conn:
|
||||
|
||||
Reference in New Issue
Block a user