Commit4cb028c

Artur Zakirov

committed

Show dashes if there isn't recovery time of a backup

1 parentbf2830b commit4cb028cCopy full SHA for 4cb028c

File tree

+24

-10

lines changed

+24

-10

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -189,13 +189,14 @@ show_backup_list(FILE out, parray backup_list)`
`189`	`189`	`pgBackup*backup;`
`190`	`190`	`constchar*modes[]= {"","PAGE","PTRACK","FULL","","PAGE+STREAM","PTRACK+STREAM","FULL+STREAM"};`
`191`	`191`	`TimeLineIDparent_tli;`
`192`		`-chartimestamp[20];`
	`192`	`+chartimestamp[20]="----";`
`193`	`193`	`charduration[20]="----";`
`194`	`194`	`chardata_bytes_str[10]="----";`
`195`	`195`
`196`	`196`	`backup=parray_get(backup_list,i);`
`197`	`197`
`198`		`-time2iso(timestamp,lengthof(timestamp),backup->recovery_time);`
	`198`	`+if (backup->recovery_time!= (time_t)0)`
	`199`	`+time2iso(timestamp,lengthof(timestamp),backup->recovery_time);`
`199`	`200`	`if (backup->end_time!= (time_t)0)`
`200`	`201`	`snprintf(duration,lengthof(duration),"%lum",`
`201`	`202`	`(backup->end_time-backup->start_time) /60);`

Lines changed: 21 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,17 +19,30 @@ def dir_files(base_dir):`
`19`	`19`
`20`	`20`	`classShowBackup(object):`
`21`	`21`	`def__init__(self,split_line):`
`22`		`-self.id=split_line[0]`
	`22`	`+self.counter=0`
	`23`	`+`
	`24`	`+self.id=self.get_inc(split_line)`
`23`	`25`	`# TODO: parse to datetime`
`24`		`-self.recovery_time="%s %s"% (split_line[1],split_line[2])`
`25`		`-self.mode=split_line[3]`
`26`		`-self.cur_tli=split_line[4]`
`27`		`-self.parent_tli=split_line[6]`
	`26`	`+iflen(split_line)==10:`
	`27`	`+self.recovery_time="%s %s"% (self.get_inc(split_line),`
	`28`	`+self.get_inc(split_line))`
	`29`	`+# if recovery time is '----'`
	`30`	`+else:`
	`31`	`+self.recovery_time=self.get_inc(split_line)`
	`32`	`+self.mode=self.get_inc(split_line)`
	`33`	`+self.cur_tli=self.get_inc(split_line)`
	`34`	`+# slash`
	`35`	`+self.counter+=1`
	`36`	`+self.parent_tli=self.get_inc(split_line)`
`28`	`37`	`# TODO: parse to interval`
`29`		`-self.time=split_line[7]`
	`38`	`+self.time=self.get_inc(split_line)`
`30`	`39`	`# TODO: maybe rename to size?`
`31`		`-self.data=split_line[8]`
`32`		`-self.status=split_line[9]`
	`40`	`+self.data=self.get_inc(split_line)`
	`41`	`+self.status=self.get_inc(split_line)`
	`42`	`+`
	`43`	`+defget_inc(self,split_line):`
	`44`	`+self.counter+=1`
	`45`	`+returnsplit_line[self.counter-1]`
`33`	`46`
`34`	`47`
`35`	`48`	`classProbackupTest(object):`

Comments

(0)