Commit0784f49

vshepard

committed

Normalize error

1 parent9f69b30 commit0784f49Copy full SHA for 0784f49

File tree

+11

-4

lines changed

+11

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1165,7 +1165,6 @@ def poll_query_until(self,`
`1165`	`1165`	`assertsleep_time>0`
`1166`	`1166`	`attempts=0`
`1167`	`1167`	`whilemax_attempts==0orattempts<max_attempts:`
`1168`		`-logging.info(f"Pooling{attempts}")`
`1169`	`1168`	`try:`
`1170`	`1169`	`res=self.execute(dbname=dbname,`
`1171`	`1170`	`query=query,`
`@@ -1189,6 +1188,7 @@ def poll_query_until(self,`
`1189`	`1188`	`return# done`
`1190`	`1189`
`1191`	`1190`	`excepttuple(suppressor []):`
	`1191`	`+logging.info(f"Trying execute, attempt{attempts+1}.\nQuery:{query}")`
`1192`	`1192`	`pass# we're suppressing them`
`1193`	`1193`
`1194`	`1194`	`time.sleep(sleep_time)`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -93,8 +93,10 @@ def exec_command(self, cmd, wait_exit=False, verbose=False, expect_error=False,`
`93`	`93`	`ifnoterror:`
`94`	`94`	`error_found=0`
`95`	`95`	`else:`
	`96`	`+error=normalize_error(error)`
`96`	`97`	`error_found=exit_status!=0orany(`
`97`		`-markerinerrorformarkerin [b'error',b'Permission denied',b'fatal',b'No such file or directory'])`
	`98`	`+markerinerrorformarkerin ['error','Permission denied','fatal','No such file or directory']`
	`99`	`+ )`
`98`	`100`
`99`	`101`	`iferror_found:`
`100`	`102`	`ifisinstance(error,bytes):`
`@@ -369,3 +371,9 @@ def db_connect(self, dbname, user, password=None, host="localhost", port=5432):`
`369`	`371`	`password=password,`
`370`	`372`	`)`
`371`	`373`	`returnconn`
	`374`	`+`
	`375`	`+`
	`376`	`+defnormalize_error(error):`
	`377`	`+ifisinstance(error,bytes):`
	`378`	`+returnerror.decode()`
	`379`	`+returnerror`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`from __future__importdivision`
`4`	`4`	`from __future__importprint_function`
`5`	`5`
`6`		`-importlogging`
`7`	`6`	`importos`
`8`	`7`
`9`	`8`	`importsys`
`@@ -229,7 +228,7 @@ def eprint(args, *kwargs):`
`229`	`228`	`"""`
`230`	`229`	`Print stuff to stderr.`
`231`	`230`	`"""`
`232`		`-logging.error(args,*kwargs)`
	`231`	`+print(args,file=sys.stderr,*kwargs)`
`233`	`232`
`234`	`233`
`235`	`234`	`defoptions_string(separator=u" ",**kwargs):`

Comments

(0)