forked from gsn/predictor
feat: predictions
This commit is contained in:
parent
42e7924be9
commit
11be8f351f
42 changed files with 2221 additions and 516 deletions
140
cmd/api/main.go
140
cmd/api/main.go
|
|
@ -5,9 +5,12 @@ import (
|
|||
"os/signal"
|
||||
"syscall"
|
||||
|
||||
"context"
|
||||
|
||||
"git.intra.yksa.space/gsn/predictor/internal/jobs/grib/updater"
|
||||
"git.intra.yksa.space/gsn/predictor/internal/pkg/errcodes"
|
||||
"git.intra.yksa.space/gsn/predictor/internal/pkg/grib"
|
||||
"git.intra.yksa.space/gsn/predictor/internal/pkg/log"
|
||||
"git.intra.yksa.space/gsn/predictor/internal/service"
|
||||
"git.intra.yksa.space/gsn/predictor/internal/transport/rest"
|
||||
"git.intra.yksa.space/gsn/predictor/internal/transport/rest/handler"
|
||||
|
|
@ -25,128 +28,120 @@ func main() {
|
|||
panic(err)
|
||||
}
|
||||
defer lg.Sync()
|
||||
ctx := log.ToCtx(context.Background(), lg)
|
||||
|
||||
// Load configuration from environment with service prefix
|
||||
cfg, err := loadConfig()
|
||||
if err != nil {
|
||||
lg.Fatal("failed to load configuration", zap.Error(err))
|
||||
log.Ctx(ctx).Fatal("failed to load configuration", zap.Error(err))
|
||||
}
|
||||
|
||||
// Load scheduler configuration
|
||||
schedulerConfig, err := loadSchedulerConfig()
|
||||
schedulerConfig, err := scheduler.NewConfig()
|
||||
if err != nil {
|
||||
lg.Fatal("failed to load scheduler configuration", zap.Error(err))
|
||||
log.Ctx(ctx).Fatal("failed to load scheduler configuration", zap.Error(err))
|
||||
}
|
||||
|
||||
// Load GRIB updater job configuration
|
||||
gribUpdaterConfig, err := loadGribUpdaterConfig()
|
||||
gribUpdaterConfig, err := updater.NewConfig()
|
||||
if err != nil {
|
||||
lg.Fatal("failed to load GRIB updater configuration", zap.Error(err))
|
||||
log.Ctx(ctx).Fatal("failed to load GRIB updater configuration", zap.Error(err))
|
||||
}
|
||||
|
||||
// Initialize Redis service
|
||||
redisService, err := redis.New(cfg.Redis)
|
||||
log.Ctx(ctx).Info("Connecting to Redis", zap.String("host", cfg.RedisHost), zap.Int("port", cfg.RedisPort))
|
||||
redisService, err := redis.New(redis.Config{
|
||||
Host: cfg.RedisHost,
|
||||
Port: cfg.RedisPort,
|
||||
Password: cfg.RedisPassword,
|
||||
DB: cfg.RedisDB,
|
||||
})
|
||||
if err != nil {
|
||||
lg.Fatal("failed to initialize Redis service", zap.Error(err))
|
||||
log.Ctx(ctx).Fatal("failed to initialize Redis service", zap.Error(err), zap.String("host", cfg.RedisHost), zap.Int("port", cfg.RedisPort))
|
||||
}
|
||||
defer redisService.Close()
|
||||
|
||||
// Initialize GRIB service
|
||||
gribService, err := grib.New(grib.ServiceConfig{
|
||||
Dir: cfg.Grib.Dir,
|
||||
TTL: cfg.Grib.TTL,
|
||||
CacheTTL: cfg.Grib.CacheTTL,
|
||||
Redis: redisService,
|
||||
Parallel: cfg.Grib.Parallel,
|
||||
Client: cfg.CreateHTTPClient(),
|
||||
Dir: cfg.GribDir,
|
||||
TTL: cfg.GribTTL,
|
||||
CacheTTL: cfg.GribCacheTTL,
|
||||
Redis: redisService,
|
||||
Parallel: cfg.GribParallel,
|
||||
Client: cfg.CreateHTTPClient(),
|
||||
DatasetURL: cfg.GribDatasetURL,
|
||||
})
|
||||
if err != nil {
|
||||
lg.Fatal("failed to initialize GRIB service", zap.Error(err))
|
||||
log.Ctx(ctx).Fatal("failed to initialize GRIB service", zap.Error(err))
|
||||
}
|
||||
defer gribService.Close()
|
||||
|
||||
// Initialize service with dependencies
|
||||
svc, err := service.New(cfg, gribService, redisService, lg)
|
||||
// Force GRIB update on startup in a goroutine
|
||||
go func() {
|
||||
log.Ctx(ctx).Info("Performing initial GRIB update (async)...")
|
||||
if err := gribService.Update(ctx); err != nil {
|
||||
log.Ctx(ctx).Error("initial GRIB update failed", zap.Error(err))
|
||||
} else {
|
||||
log.Ctx(ctx).Info("initial GRIB update complete")
|
||||
}
|
||||
}()
|
||||
|
||||
svc, err := service.New(cfg, gribService, redisService)
|
||||
if err != nil {
|
||||
lg.Fatal("failed to initialize service", zap.Error(err))
|
||||
log.Ctx(ctx).Fatal("failed to initialize service", zap.Error(err))
|
||||
}
|
||||
defer svc.Close()
|
||||
|
||||
// Initialize scheduler
|
||||
var sched *scheduler.Scheduler
|
||||
if schedulerConfig.Enabled {
|
||||
sched = scheduler.New(lg)
|
||||
sched = scheduler.New()
|
||||
|
||||
// Add GRIB update job
|
||||
gribJob := updater.New(gribService, gribUpdaterConfig, lg)
|
||||
gribJob := updater.New(gribService, gribUpdaterConfig)
|
||||
if err := sched.AddJob(gribJob); err != nil {
|
||||
lg.Error("failed to add GRIB update job to scheduler", zap.Error(err))
|
||||
log.Ctx(ctx).Error("failed to add GRIB update job to scheduler", zap.Error(err))
|
||||
}
|
||||
|
||||
// TODO: Add more jobs here as needed
|
||||
// Example:
|
||||
// cleanupConfig := cleanup.NewConfig()
|
||||
// cleanupJob := cleanup.New(svc, cleanupConfig, lg)
|
||||
// if err := sched.AddJob(cleanupJob); err != nil {
|
||||
// lg.Error("failed to add cleanup job to scheduler", zap.Error(err))
|
||||
// }
|
||||
|
||||
lg.Info("scheduler initialized with jobs")
|
||||
log.Ctx(ctx).Info("scheduler initialized with jobs")
|
||||
}
|
||||
|
||||
// Initialize handler
|
||||
handler := handler.New(svc)
|
||||
|
||||
// Initialize transport
|
||||
restConfig, err := loadRestConfig()
|
||||
restConfig, err := rest.NewConfig()
|
||||
if err != nil {
|
||||
lg.Fatal("failed to init transport config", zap.Error(err))
|
||||
}
|
||||
|
||||
transport, err := rest.New(lg, handler, restConfig)
|
||||
transport, err := rest.New(handler, restConfig)
|
||||
if err != nil {
|
||||
lg.Fatal("failed to init transport", zap.Error(err))
|
||||
}
|
||||
|
||||
// Start service
|
||||
svc.Start()
|
||||
|
||||
// Start scheduler if enabled
|
||||
if sched != nil {
|
||||
sched.Start()
|
||||
lg.Info("scheduler started")
|
||||
}
|
||||
|
||||
lg.Info("service started successfully",
|
||||
zap.String("grib_dir", cfg.Grib.Dir),
|
||||
zap.Duration("grib_ttl", cfg.Grib.TTL),
|
||||
zap.Duration("grib_cache_ttl", cfg.Grib.CacheTTL),
|
||||
zap.Int("grib_parallel", cfg.Grib.Parallel),
|
||||
zap.String("grib_dir", cfg.GribDir),
|
||||
zap.Duration("grib_ttl", cfg.GribTTL),
|
||||
zap.Duration("grib_cache_ttl", cfg.GribCacheTTL),
|
||||
zap.Int("grib_parallel", cfg.GribParallel),
|
||||
zap.Bool("scheduler_enabled", schedulerConfig.Enabled),
|
||||
zap.Duration("grib_update_interval", gribUpdaterConfig.Interval))
|
||||
|
||||
// Wait for shutdown signal
|
||||
sigChan := make(chan os.Signal, 1)
|
||||
signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM)
|
||||
|
||||
// Start server in goroutine
|
||||
go func() {
|
||||
lg.Info("starting HTTP server")
|
||||
lg.Info("starting HTTP server on port", zap.Int("port", restConfig.Port))
|
||||
transport.Run()
|
||||
}()
|
||||
|
||||
// Wait for shutdown signal
|
||||
<-sigChan
|
||||
lg.Info("received shutdown signal, stopping service")
|
||||
|
||||
// Stop scheduler first
|
||||
if sched != nil {
|
||||
sched.Stop()
|
||||
lg.Info("scheduler stopped")
|
||||
}
|
||||
}
|
||||
|
||||
// loadConfig loads configuration from environment with service prefix
|
||||
func loadConfig() (*service.Config, error) {
|
||||
cfg := &service.Config{}
|
||||
|
||||
|
|
@ -158,42 +153,3 @@ func loadConfig() (*service.Config, error) {
|
|||
|
||||
return cfg, nil
|
||||
}
|
||||
|
||||
// loadSchedulerConfig loads scheduler configuration from environment
|
||||
func loadSchedulerConfig() (*scheduler.Config, error) {
|
||||
cfg := &scheduler.Config{}
|
||||
|
||||
if err := env.ParseWithOptions(cfg, env.Options{
|
||||
PrefixTagName: servicePrefix + "_SCHEDULER_",
|
||||
}); err != nil {
|
||||
return nil, errcodes.Wrap(err, "failed to parse scheduler configuration")
|
||||
}
|
||||
|
||||
return cfg, nil
|
||||
}
|
||||
|
||||
// loadGribUpdaterConfig loads GRIB updater job configuration from environment
|
||||
func loadGribUpdaterConfig() (*updater.Config, error) {
|
||||
cfg := &updater.Config{}
|
||||
|
||||
if err := env.ParseWithOptions(cfg, env.Options{
|
||||
PrefixTagName: servicePrefix + "_GRIB_UPDATER_",
|
||||
}); err != nil {
|
||||
return nil, errcodes.Wrap(err, "failed to parse GRIB updater configuration")
|
||||
}
|
||||
|
||||
return cfg, nil
|
||||
}
|
||||
|
||||
// loadRestConfig loads REST transport configuration from environment with service prefix
|
||||
func loadRestConfig() (*rest.Config, error) {
|
||||
cfg := &rest.Config{}
|
||||
|
||||
if err := env.ParseWithOptions(cfg, env.Options{
|
||||
PrefixTagName: servicePrefix + "_REST_",
|
||||
}); err != nil {
|
||||
return nil, errcodes.Wrap(err, "failed to parse REST configuration")
|
||||
}
|
||||
|
||||
return cfg, nil
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue