mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-08-16 08:34:12 +02:00
2019-08-26 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in the 'pypad_urlwrite.py' PyPAD script that caused an infinite loop.
This commit is contained in:
parent
22b9679783
commit
6fceb27c2f
@ -19012,3 +19012,6 @@
|
||||
2019-08-26 Fred Gleason <fredg@paravelsystems.com>
|
||||
* Fixed a bug in the 'pypad_udp.py' PyPAD script that caused
|
||||
an infinite loop.
|
||||
2019-08-26 Fred Gleason <fredg@paravelsystems.com>
|
||||
* Fixed a bug in the 'pypad_urlwrite.py' PyPAD script that caused
|
||||
an infinite loop.
|
||||
|
@ -32,27 +32,25 @@ def eprint(*args,**kwargs):
|
||||
|
||||
def ProcessPad(update):
|
||||
n=1
|
||||
try:
|
||||
while(True):
|
||||
section='Url'+str(n)
|
||||
if update.shouldBeProcessed(section):
|
||||
fmtstr=update.config().get(section,'FormatString')
|
||||
buf=BytesIO(update.resolvePadFields(fmtstr,int(update.config().get(section,'Encoding'))).encode('utf-8'))
|
||||
curl=pycurl.Curl()
|
||||
curl.setopt(curl.URL,update.resolveFilepath(update.config().get(section,'Url'),update.dateTime()))
|
||||
curl.setopt(curl.USERNAME,update.config().get(section,'Username'))
|
||||
curl.setopt(curl.PASSWORD,update.config().get(section,'Password'))
|
||||
curl.setopt(curl.UPLOAD,True)
|
||||
curl.setopt(curl.READDATA,buf)
|
||||
try:
|
||||
curl.perform()
|
||||
except pycurl.error:
|
||||
update.syslog(syslog.LOG_WARNING,'['+section+'] failed: '+curl.errstr())
|
||||
curl.close()
|
||||
n=n+1
|
||||
section='Url'+str(n)
|
||||
while(update.config().has_section(section)):
|
||||
if update.shouldBeProcessed(section):
|
||||
fmtstr=update.config().get(section,'FormatString')
|
||||
buf=BytesIO(update.resolvePadFields(fmtstr,int(update.config().get(section,'Encoding'))).encode('utf-8'))
|
||||
curl=pycurl.Curl()
|
||||
curl.setopt(curl.URL,update.resolveFilepath(update.config().get(section,'Url'),update.dateTime()))
|
||||
curl.setopt(curl.USERNAME,update.config().get(section,'Username'))
|
||||
curl.setopt(curl.PASSWORD,update.config().get(section,'Password'))
|
||||
curl.setopt(curl.UPLOAD,True)
|
||||
curl.setopt(curl.READDATA,buf)
|
||||
try:
|
||||
curl.perform()
|
||||
except pycurl.error:
|
||||
update.syslog(syslog.LOG_WARNING,'['+section+'] failed: '+curl.errstr())
|
||||
curl.close()
|
||||
n=n+1
|
||||
section='Url'+str(n)
|
||||
|
||||
except configparser.NoSectionError:
|
||||
return
|
||||
|
||||
#
|
||||
# 'Main' function
|
||||
|
Loading…
x
Reference in New Issue
Block a user