From 8fa7624825eae18ec82382ea71e64f0a3ed64842 Mon Sep 17 00:00:00 2001 From: ngfchl Date: Tue, 6 Sep 2022 00:54:42 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E9=87=8D=E6=9E=84=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E9=A1=B5=E9=9D=A24?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- auto_pt/urls.py | 2 - auto_pt/views.py | 100 +++------------------------------- templates/auto_pt/update.html | 2 +- 3 files changed, 9 insertions(+), 95 deletions(-) diff --git a/auto_pt/urls.py b/auto_pt/urls.py index e68c91e..1f5b354 100644 --- a/auto_pt/urls.py +++ b/auto_pt/urls.py @@ -9,9 +9,7 @@ urlpatterns = [ path(r'test_field', views.test_field, name='test_field'), path(r'test_notify', views.test_notify, name='test_notify'), path(r'update', views.update_page, name='update_page'), - path(r'restart', views.restart_container, name='restart_container'), path(r'do_restart', views.do_restart, name='do_restart'), path(r'do_update', views.do_update, name='do_update'), - path(r'get_update', views.do_update_xpath, name='do_update_xpath'), path(r'do_sql', views.do_sql, name='do_sql'), ] diff --git a/auto_pt/views.py b/auto_pt/views.py index 68edf9c..0cfd64e 100644 --- a/auto_pt/views.py +++ b/auto_pt/views.py @@ -141,22 +141,6 @@ def get_update_logs(): commits = list(repo.iter_commits('master', max_count=10)) # 获取远程仓库commits记录 remote_commits = list(repo.iter_commits("origin/master", max_count=10)) - """ - # commits = [str(commit) for commit in commits] - # remote_commits = [str(commit) for commit in remote_commits] - # # for commit in commits: - # # print(commit.hexsha) - # # print(commit.committed_datetime) - # # print(commit.message) - # return render(request, 'auto_pt/restart.html', - # context={ - # # 'update_md': update_md, - # 'local_logs': commits, - # 'update_notes': remote_commits, - # 'update': update, - # 'update_tips': update_tips, - # }) - """ return commits[0].hexsha == remote_commits[0].hexsha @@ -196,46 +180,6 @@ def update_page(request): }) -def restart_container(request): - # scraper = pt_spider.get_scraper() - # res = scraper.get('https://gitee.com/ngfchl/ptools/raw/master/update.md') - # update_md = markdown.markdown(res.text, extensions=['tables']) - # 获取docker对象 - try: - client = docker.from_env() - # 从内部获取容器id - cid = socket.gethostname() - client.api.info() - started_at = client.api.inspect_container(cid).get('State').get('StartedAt')[:-4] + 'Z' - utc_format = "%Y-%m-%dT%H:%M:%S.%fZ" - restart = 'true' - utc_time = datetime.strptime(started_at, utc_format) - local_time = utc_time + timedelta(hours=8) - delta = str((datetime.now() - local_time).seconds) + '秒' - print(delta) - # delta = local_time.strftime('%Y-%m-%dT%H:%M:%S.%f') - # delta = delta.astimezone(pytz.timezone('Asia/Shanghai')) - except Exception as e: - # raise - restart = 'false' - delta = '程序未在容器中启动？' - if get_update_logs(): - update = 'false' - update_tips = '目前您使用的是最新版本！' - else: - update = 'true' - update_tips = '已有新版本，请根据需要升级！' - return render(request, 'auto_pt/restart.html', - context={ - 'delta': delta, - 'restart': restart, - 'local_logs': get_git_logs(), - 'update_notes': get_git_logs(master='origin/master'), - 'update': update, - 'update_tips': update_tips - }) - - def do_update(request): try: print('开始拉取更新') @@ -261,8 +205,10 @@ def do_update(request): site_obj = Site.objects.update_or_create(defaults=site_rules, url=site_rules.get('url')) print(site_obj[0].name + (' 规则新增成功！' if site_obj[1] else '规则更新成功！')) print('更新完毕，开始重启') - cid = socket.gethostname() - subprocess.Popen('docker restart {}'.format(cid), shell=True) + do_restart(request) + # cid = socket.gethostname() + # reboot = subprocess.Popen('docker restart {}'.format(cid), shell=True, stdout=subprocess.PIPE, ) + # out = reboot.stdout.readline().decode('utf8') # client.api.inspect_container(cid) # StartedAt = client.api.inspect_container(cid).get('State').get('StartedAt') return JsonResponse(data=CommonResponse.error( @@ -274,38 +220,6 @@ def do_update(request): ).to_dict(), safe=False) -def do_update_xpath(request): - try: - # 备份数据库 - subprocess.Popen( - 'cp /var/www/html/ptools/db/db.sqlite3 /var/www/html/ptools/db/db.sqlite3-$(date "+%Y%m%d%H%M%S")', - shell=True - ) - # 更新数据库 - with open('./main_pt_site_site.json', 'r') as f: - # print(f.readlines()) - data = json.load(f) - # print(data[2]) - print(data[0].get('url')) - xpath_update = [] - print('更新规则中，返回结果为True为新建，为False为更新，其他是错误了') - for site_rules in data: - if site_rules.get('pk'): - del site_rules['pk'] - site_obj = Site.objects.update_or_create(defaults=site_rules, url=site_rules.get('url')) - print(site_obj) - xpath_update.append(site_obj[0].name + (' 规则新增成功！' if site_obj[1] else '规则更新成功！')) - return JsonResponse(data=CommonResponse.success( - msg='更新成功！!', - data={ - 'update_log': xpath_update - }).to_dict(), safe=False) - except Exception as e: - return JsonResponse(data=CommonResponse.error( - msg='更新失败!' + str(e) - ).to_dict(), safe=False) - - def do_restart(request): try: # 获取docker对象 @@ -317,11 +231,13 @@ def do_restart(request): # 重启容器 # client.api.restart(cid) print('重启中') - subprocess.Popen('docker restart {}'.format(cid), shell=True) + reboot = subprocess.Popen('docker restart {}'.format(cid), shell=True, stdout=subprocess.PIPE, ) + out = reboot.stdout.readline().decode('utf8') + print(out) # client.api.inspect_container(cid) # StartedAt = client.api.inspect_container(cid).get('State').get('StartedAt') return JsonResponse(data=CommonResponse.error( - msg='重启指令发送成功，容器重启中 ...' + msg='重启指令发送成功，容器重启中 ...' + out ).to_dict(), safe=False) except Exception as e: return JsonResponse(data=CommonResponse.error( diff --git a/templates/auto_pt/update.html b/templates/auto_pt/update.html index b39b807..7ef3d68 100644 --- a/templates/auto_pt/update.html +++ b/templates/auto_pt/update.html @@ -23,7 +23,7 @@ - 重启更新 + 重启更新 重启