NotificationsYou must be signed in to change notification settings
Fork35
Star144

Commit0756cab

committed

show N last log lines in exceptions (impl file_tail())

1 parentd243e49 commit0756cabCopy full SHA for 0756cab

File tree

3 files changed

+52

-17

lines changed

testgres

3 files changed

+52

-17

lines changed

`‎testgres/config.py`

Lines changed: 9 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,19 +4,20 @@`
`4`	`4`	`classTestgresConfig:`
`5`	`5`	`"""`
`6`	`6`	`Global config (override default settings).`
`7`		`- """`
`8`	`7`
`9`		`-# shall we cache pg_config results?`
`10`		`-cache_pg_config=True`
	`8`	`+ Attributes:`
	`9`	`+ cache_initdb: shall we use cached initdb instance?`
	`10`	`+ cache_pg_config: shall we cache pg_config results?`
	`11`	`+ cached_initdb_dir: shall we create a temp dir for cached initdb?`
	`12`	`+ node_cleanup_full: shall we remove EVERYTHING (including logs)?`
	`13`	`+ error_log_lines: N of log lines to be included into exception (0=inf).`
	`14`	`+ """`
`11`	`15`
`12`		`-# shall we use cached initdb instance?`
`13`	`16`	`cache_initdb=True`
`14`		`-`
`15`		`-# shall we create a temp dir for cached initdb?`
	`17`	`+cache_pg_config=True`
`16`	`18`	`cached_initdb_dir=None`
`17`		`-`
`18`		`-# shall we remove EVERYTHING (including logs)?`
`19`	`19`	`node_cleanup_full=True`
	`20`	`+error_log_lines=20`
`20`	`21`
`21`	`22`
`22`	`23`	`defconfigure_testgres(**options):`

`‎testgres/node.py`

Lines changed: 16 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@`
`37`	`37`
`38`	`38`	`from .utilsimport \`
`39`	`39`	`get_bin_path, \`
	`40`	`+file_tailas_file_tail, \`
`40`	`41`	`pg_version_geas_pg_version_ge, \`
`41`	`42`	`reserve_portas_reserve_port, \`
`42`	`43`	`release_portas_release_port, \`
`@@ -168,12 +169,12 @@ def _maybe_stop_logger(self):`
`168`	`169`	`self._logger.stop()`
`169`	`170`
`170`	`171`	`def_format_verbose_error(self,message=None):`
`171`		`-# list of important files`
	`172`	`+# list of important files + N of last lines`
`172`	`173`	`files= [`
`173`		`-os.path.join(self.data_dir,"postgresql.conf"),`
`174`		`-os.path.join(self.data_dir,"recovery.conf"),`
`175`		`-os.path.join(self.data_dir,"pg_hba.conf"),`
`176`		`-self.pg_log_name# main log file`
	`174`	`+(os.path.join(self.data_dir,"postgresql.conf"),0),`
	`175`	`+(os.path.join(self.data_dir,"recovery.conf"),0),`
	`176`	`+(os.path.join(self.data_dir,"pg_hba.conf"),0),`
	`177`	`+(self.pg_log_name,TestgresConfig.error_log_lines)`
`177`	`178`	`]`
`178`	`179`
`179`	`180`	`error_text=""`
`@@ -183,14 +184,20 @@ def _format_verbose_error(self, message=None):`
`183`	`184`	`error_text+=message`
`184`	`185`	`error_text+='\n'*2`
`185`	`186`
`186`		`-forfinfiles:`
	`187`	`+forf,num_linesinfiles:`
`187`	`188`	`# skip missing files`
`188`	`189`	`ifnotos.path.exists(f):`
`189`	`190`	`continue`
`190`	`191`
`191`		`-# append contents`
`192`		`-withio.open(f,"r")as_f:`
`193`		`-lines=_f.read()`
	`192`	`+withio.open(f,"rb")as_f:`
	`193`	`+ifnum_lines>0:`
	`194`	`+# take last N lines of file`
	`195`	`+lines=b''.join(_file_tail(_f,num_lines)).decode('utf-8')`
	`196`	`+else:`
	`197`	`+# read whole file`
	`198`	`+lines=_f.read().decode('utf-8')`
	`199`	`+`
	`200`	`+# append contents`
`194`	`201`	`error_text+=u"{}:\n----\n{}\n".format(f,lines)`
`195`	`202`
`196`	`203`	`returnerror_text`

`‎testgres/utils.py`

Lines changed: 27 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`# coding: utf-8`
`2`	`2`
	`3`	`+from __future__importdivision`
	`4`	`+`
`3`	`5`	`importio`
`4`	`6`	`importos`
`5`	`7`	`importport_for`
`@@ -203,3 +205,28 @@ def pg_version_ge(version):`
`203`	`205`	`min_ver=LooseVersion(version)`
`204`	`206`
`205`	`207`	`returncur_ver>=min_ver`
	`208`	`+`
	`209`	`+`
	`210`	`+deffile_tail(f,num_lines):`
	`211`	`+"""`
	`212`	`+ Get last N lines of a file.`
	`213`	`+ """`
	`214`	`+`
	`215`	`+assert(num_lines>0)`
	`216`	`+`
	`217`	`+bufsize=8192`
	`218`	`+buffers=1`
	`219`	`+`
	`220`	`+end_pos=f.seek(0,os.SEEK_END)`
	`221`	`+`
	`222`	`+whileTrue:`
	`223`	`+offset=max(0,end_pos-bufsize*buffers)`
	`224`	`+pos=f.seek(offset,os.SEEK_SET)`
	`225`	`+`
	`226`	`+lines=f.readlines()`
	`227`	`+cur_lines=len(lines)`
	`228`	`+`
	`229`	`+ifcur_lines>num_linesorpos==0:`
	`230`	`+returnlines[-num_lines:]`
	`231`	`+`
	`232`	`+buffers=int(buffers*max(2,num_lines/max(cur_lines,1)))`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit0756cab

File tree

3 files changed

3 files changed

`‎testgres/config.py`

`‎testgres/node.py`

`‎testgres/utils.py`

0 commit comments