diff --git a/cmd/log.go b/cmd/log.go index 4a17b9e..33ef80f 100644 --- a/cmd/log.go +++ b/cmd/log.go @@ -48,8 +48,6 @@ func init() { ForceColors: false, DisableColors: true, } - - configureLogger(logrus.StandardLogger(), "log/SJY01-imgproc.log", logrus.DebugLevel) } func NewLogger(logfile string) *logrus.Logger { @@ -65,7 +63,7 @@ func configureLogger(logger *logrus.Logger, logfile string, level logrus.Level) writer, _ := rotatelogs.New( logfile+".%Y%m%d", rotatelogs.WithLinkName(logfile), - rotatelogs.WithMaxAge(time.Duration(30*24)*time.Hour), + rotatelogs.WithMaxAge(time.Duration(7*24)*time.Hour), rotatelogs.WithRotationTime(time.Duration(24)*time.Hour), ) diff --git a/cmd/proc.go b/cmd/proc.go index 5e613ac..b6cba7f 100644 --- a/cmd/proc.go +++ b/cmd/proc.go @@ -27,7 +27,12 @@ var procCmd = &cobra.Command{ Long: `process images`, Run: func(cmd *cobra.Command, args []string) { config.GViper = config.InitViper(configFile) - logrus.SetLevel(config.GCONFIG.LogLevel) + os.MkdirAll(config.GCONFIG.Log.LogDir, 0755) + configureLogger(logrus.StandardLogger(), + filepath.Join(config.GCONFIG.Log.LogDir, "imgproc.log"), + config.GCONFIG.Log.LogLevel) + + logrus.SetLevel(config.GCONFIG.Log.LogLevel) reg := producer.NewRegistrator(producer.DownSampled) reg.Params = initParams() @@ -35,7 +40,7 @@ var procCmd = &cobra.Command{ if err := reg.LoadAuxData(); err != nil { logrus.Fatal(err) } - reg.AuxPrint() + // reg.AuxPrint() if err := reg.LoadMssRaw(); err != nil { logrus.Fatal(err) diff --git a/pkg/config/config.go b/pkg/config/config.go index f651a22..aa4a210 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -9,7 +9,12 @@ type Config struct { CoRegistration CoRegistrationConfig `yaml:"coregistration" mapstructure:"coregistration"` Radiation RadiationConfig `yaml:"radiation" mapstructure:"radiation"` BrowserImg BrowserImgConfig `yaml:"browser_img" mapstructure:"browser_img"` - LogLevel logrus.Level `yaml:"log_level" mapstructure:"log_level"` + Log LogConfig `yaml:"log" mapstructure:"log"` +} + +type LogConfig struct { + LogLevel logrus.Level `yaml:"log_level" mapstructure:"log_level"` + LogDir string `yaml:"log_dir" mapstructure:"log_dir"` } type CoRegistrationConfig struct { @@ -44,7 +49,10 @@ var GCONFIG Config func init() { GCONFIG = Config{ - LogLevel: logrus.DebugLevel, + Log: LogConfig{ + LogLevel: logrus.DebugLevel, + LogDir: "log/SJY01ImageProc", + }, CoRegistration: CoRegistrationConfig{ MssBands: 4, PixelBytes: 2, diff --git a/pkg/producer/aux.go b/pkg/producer/aux.go index cdb2f50..9184ee9 100644 --- a/pkg/producer/aux.go +++ b/pkg/producer/aux.go @@ -5,6 +5,7 @@ import ( "fmt" "math" "os" + "path/filepath" "time" log "github.com/sirupsen/logrus" @@ -17,6 +18,7 @@ import ( "github.com/paulmach/orb/planar" "starwiz.cn/sjy01/image-proc/pkg/auxilary" "starwiz.cn/sjy01/image-proc/pkg/calculator" + "starwiz.cn/sjy01/image-proc/pkg/config" "starwiz.cn/sjy01/image-proc/pkg/payload" "starwiz.cn/sjy01/image-proc/pkg/utils" ) @@ -66,7 +68,7 @@ func (r *Registrator) AuxPrint() { fcPos84.Features = append(fcPos84.Features, geojson.NewFeature(point)) } data, _ := json.Marshal(fcPos84) - f, _ := os.Create(fmt.Sprintf("log/%s_aux_pos_84.geojson", r.Params.DataId)) + f, _ := os.Create(filepath.Join(config.GCONFIG.Log.LogDir, fmt.Sprintf("%s_aux_pos_84.geojson", r.Params.DataId))) defer f.Close() f.Write(data) @@ -82,7 +84,7 @@ func (r *Registrator) AuxPrint() { fcPos84Interp.Features = append(fcPos84Interp.Features, geojson.NewFeature(point)) } data, _ = json.Marshal(fcPos84Interp) - f, _ = os.Create(fmt.Sprintf("log/%s_aux_pos_84_interp.geojson", r.Params.DataId)) + f, _ = os.Create(filepath.Join(config.GCONFIG.Log.LogDir, fmt.Sprintf("%s_aux_pos_84_interp.geojson", r.Params.DataId))) defer f.Close() f.Write(data) } diff --git a/pkg/producer/image_registration.go b/pkg/producer/image_registration.go index 5f74c17..08101ef 100644 --- a/pkg/producer/image_registration.go +++ b/pkg/producer/image_registration.go @@ -31,6 +31,10 @@ const ( UpSampled ResampleMethod = "up_sample_mss" PanResolution = 1.3 // mm/pixel MssResolution = 5.2 + ReferenceShiftYB1 = 100.0 + ReferenceShiftYB2 = 200.0 + ReferenceShiftYB3 = 300.0 + ReferenceShiftYB4 = 400.0 ) type ResampleMethod string