Skip to content

Updated occweb authorization #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updated occweb authorization #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5e2ae1
Updated occweb authorization
May 11, 2022
fc0a85d
Replaced curl command with requests.get
May 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions MSID_limit/compare_database_and_update.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
import unittest
import time
import Chandra.Time
from pathlib import Path
from kadi.occweb import get_auth
import requests

#--- reading directory list
#
Expand Down Expand Up @@ -361,16 +364,15 @@ def download_glimmon():
cmd = 'mv -f ' + glimmon + ' ' + glimmon + '~'
os.system(cmd)

with open('/home/isobe/.occpass' , 'r') as f:
out = f.read().strip()
#
#--- download the database
#
cmd = 'curl -u tisobe:' + out
cmd = cmd + ' https://occweb.cfa.harvard.edu/occweb/FOT/engineering/thermal/'
cmd = cmd + 'AXAFAUTO_RSYNC/G_LIMMON_Archive/glimmondb.sqlite3 > ' + glimmon

os.system(cmd)
url = 'https://occweb.cfa.harvard.edu/occweb/FOT/engineering/thermal/AXAFAUTO_RSYNC/G_LIMMON_Archive/glimmondb.sqlite3'
# get_auth() will look for occweb credentials in $HOME/.netrc
response = requests.get(url, auth=get_auth(), timeout=30)
Path('glimmondb.sqlite3').write_bytes(response.content)


#-----------------------------------------------------------------------------------------
#-- test_and_save: save a copy of op_limit.db and glimon to Past_data directory --
Expand Down Expand Up @@ -401,20 +403,20 @@ def test_and_save():
#--- update the main mta limit database
#
if len(data) < 1:
cmd = 'rm ' + temp_opfile
cmd = f'rm {temp_opfile}'
Copy link
Member

@taldcroft taldcroft May 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a huge deal, but all these os.system commands can be replaced by Python built-in functions in https://docs.python.org/3.8/library/shutil.html and https://docs.python.org/3.8/library/os.html. There are move() and copy2() in shutil and remove in os.

The main problem here is that there is no real error handling in the current os.system(cmd) call. If that fails then a non-zero value is returned but that is being ignored in this code. At the least all the os.system(cmd) calls should be replaced by assert os.system(cmd) == 0 so an exception is raised for a problem.

os.system(cmd)
else:
cmd = 'mv ' + temp_opfile + ' ' + main_dir +'op_limits.db'
cmd = f'mv {temp_opfile} {main_dir}/op_limits.db'
os.system(cmd)

tail = time.strftime("%m%d%y", time.gmtime())
cmd = 'cp ' + main_dir + 'op_limits.db ' + main_dir + 'Past_data/op_limits.db_' + tail
cmd = f'cp {main_dir}/op_limits.db {main_dir}/Past_data/op_limits.db_{tail}'
os.system(cmd)

cmd = 'cp -f ' + main_dir + glimmon + '/data/mta4/MTA/data/op_limits/.'
cmd = f'cp -f {glimmon} /data/mta4/MTA/data/op_limits/.'
os.system(cmd)

cmd = 'cp ' + main_dir + glimmon + ' ' + main_dir + 'Past_data/' + glimmon + '_' + tail
cmd = f'cp {glimmon} {main_dir}/Past_data/glimmondb.sqlite3_{tail}'
os.system(cmd)
#
#--- notify the changes to admin person
Expand Down