mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-10-19 00:51:13 +02:00
2021-12-15 Fred Gleason <fredg@paravelsystems.com>
* Renamed the 'rivwebpyapi.rivwebpyapi()' class to 'rivwebpyapi.Site()'. * Added 'make pypi' and 'make post-pypi' targets to 'apis/rivwebpyapi/Makefile.am'. Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
@@ -23,8 +23,10 @@
|
||||
#
|
||||
|
||||
import getpass
|
||||
import rivwebpyapi
|
||||
import sys
|
||||
|
||||
from rivwebpyapi import rivwebpyapi
|
||||
|
||||
def eprint(*args,**kwargs):
|
||||
print(*args,file=sys.stderr,**kwargs)
|
||||
|
||||
@@ -70,13 +72,13 @@ if(from_log_name==to_log_name):
|
||||
eprint('"--from-log-name" and "--to-log_name" must be different')
|
||||
sys.exit(1)
|
||||
|
||||
webapi=rivwebpyapi.rivwebpyapi(url=url,username=username,password=password)
|
||||
site=rivwebpyapi.Site(url=url,username=username,password=password)
|
||||
|
||||
#
|
||||
# Get the "from" log
|
||||
#
|
||||
try:
|
||||
log_header=webapi.ListLogs(log_name=from_log_name)[0]
|
||||
log_header=site.ListLogs(log_name=from_log_name)[0]
|
||||
except rivwebpyapi.RivWebPyError as err:
|
||||
eprint('*** ERROR Calling ListLogs() ***')
|
||||
eprint('Response Code: '+str(err.responseCode))
|
||||
@@ -86,7 +88,7 @@ except rivwebpyapi.RivWebPyError as err:
|
||||
sys.exit(1)
|
||||
|
||||
try:
|
||||
log_lines=webapi.ListLog(log_name=from_log_name)
|
||||
log_lines=site.ListLog(log_name=from_log_name)
|
||||
except rivwebpyapi.RivWebPyError as err:
|
||||
eprint('*** ERROR Calling ListLog() ***')
|
||||
eprint('Response Code: '+str(err.responseCode))
|
||||
@@ -99,7 +101,7 @@ except rivwebpyapi.RivWebPyError as err:
|
||||
# Save "to" log
|
||||
#
|
||||
try:
|
||||
webapi.SaveLog(log_name=to_log_name,header_values=log_header,line_values=log_lines)
|
||||
site.SaveLog(log_name=to_log_name,header_values=log_header,line_values=log_lines)
|
||||
except rivwebpyapi.RivWebPyError as err:
|
||||
eprint('*** ERROR Calling SaveLog() ***')
|
||||
eprint('Response Code: '+str(err.responseCode))
|
||||
|
Reference in New Issue
Block a user