Project

General

Profile

« Previous | Next » 

Revision 3399

Added by Aaron Marcuse-Kubitza over 12 years ago

backups/Makefile: Don't log stderr or run the command verbosely and instead just output the command and run time to the terminal. This matches what we do for pg_dump, which works better because it just prints the useful information when it's done running.

View differences:

backups/Makefile
33 33 

  		




  34
  34
  
    
##### Backups


  		




  35
  35
  
    

  		




  36
  
  
    
restore := "time" $(bin)/postgres_vegbien pg_restore --exit-on-error --verbose


  		




  
  36
  
    
restore := "time" $(bin)/postgres_vegbien pg_restore --exit-on-error


  		




  37
  37
  
    
restoreBien := $(restore) --dbname=vegbien


  		




  38
  38
  
    
# pg_restore doesn't support PGDATABASE env var


  		




  39
  39
  
    

  		




  40
  40
  
    
# Must come before %.sql with no prerequisites to be matched first


  		




  41
  41
  
    
%.sql: %


  		




  42
  
  
    
	$(restore) $< >$@ 2>$<.extract.log


  		




  43
  
  
    
	rm $<.extract.log


  		




  
  42
  
    
	$(restore) $< >$@


  		




  44
  43
  
    

  		




  45
  44
  
    
# Note: This can't be used for the current (unrotated) public schema because


  		




  46
  45
  
    
# pg_dump doesn't back up the CREATE SCHEMA statement for it, assuming falsely


  		




  ......




  49
  48
  
    
	"time" env data=1 $(if $(filter %.sql,$@),plain=1) $(pg_dump) $* >$@


  		




  50
  49
  
    

  		




  51
  50
  
    
%/restore: % _always


  		




  52
  
  
    
	$(restoreBien) $< &>$<.log


  		




  53
  
  
    
	rm $<.log


  		




  
  51
  
    
	$(restoreBien) $<


  		




  54
  52
  
    

  		




  55
  53
  
    
##### Archived imports


  		




  56
  54
  
    

  		












Also available in:  Unified diff