From 96bbcdf9365dd8c35b1c6ae9f6231974363c4bb1 Mon Sep 17 00:00:00 2001
From: Zike Yang <zike@apache.org>
Date: Wed, 4 Sep 2024 23:32:32 +0800
Subject: [PATCH] feat: improve log and package loader

(cherry picked from commit f8012e8e5e76e5b96a32338cd451d5d0e295ad8a)
---
 common/log.go             |  7 +++----
 conf/function-stream.yaml |  2 +-
 server/server.go          | 15 +++++++++++----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/common/log.go b/common/log.go
index fe7d9537..76738193 100644
--- a/common/log.go
+++ b/common/log.go
@@ -18,16 +18,15 @@ package common
 
 import (
 	"context"
-
 	"github.com/go-logr/logr"
 	"github.com/go-logr/zapr"
 	"go.uber.org/zap"
 )
 
 const (
-	DebugLevel int = 4
-	InfoLevel  int = 3
-	WarnLevel  int = 2
+	DebugLevel int = -1
+	InfoLevel  int = 0 // Default log level
+	WarnLevel  int = 1
 )
 
 type Logger struct {
diff --git a/conf/function-stream.yaml b/conf/function-stream.yaml
index 30b28f3f..77a073c8 100644
--- a/conf/function-stream.yaml
+++ b/conf/function-stream.yaml
@@ -23,4 +23,4 @@ tube-config:
 runtime-config:
   external:
     socket-path: /tmp/fs.sock
-function-store: ./functionsa
\ No newline at end of file
+function-store: ./functions
\ No newline at end of file
diff --git a/server/server.go b/server/server.go
index 431e5251..13eb2391 100644
--- a/server/server.go
+++ b/server/server.go
@@ -66,6 +66,7 @@ type serverOptions struct {
 	managerOpts            []fs.ManagerOption
 	httpTubeFact           *contube.HttpTubeFactory
 	stateStoreLoader       StateStoreLoaderType
+	packageLoader          api.PackageLoader
 	functionStore          string
 	enableTls              bool
 	tlsCertFile            string
@@ -162,6 +163,13 @@ func WithStateStoreLoader(loader func(c *StateStoreConfig) (api.StateStore, erro
 	})
 }
 
+func WithPackageLoader(packageLoader api.PackageLoader) ServerOption {
+	return serverOptionFunc(func(o *serverOptions) (*serverOptions, error) {
+		o.managerOpts = append(o.managerOpts, fs.WithPackageLoader(packageLoader))
+		return o, nil
+	})
+}
+
 func WithLogger(log *logr.Logger) ServerOption {
 	return serverOptionFunc(func(c *serverOptions) (*serverOptions, error) {
 		c.log = log
@@ -252,6 +260,7 @@ func NewServer(opts ...ServerOption) (*Server, error) {
 	options.runtimeFactoryBuilders = make(map[string]func(configMap config.ConfigMap) (api.FunctionRuntimeFactory, error))
 	options.runtimeConfig = make(map[string]config.ConfigMap)
 	options.stateStoreLoader = DefaultStateStoreLoader
+	options.managerOpts = []fs.ManagerOption{}
 	for _, o := range opts {
 		if o == nil {
 			continue
@@ -271,11 +280,9 @@ func NewServer(opts ...ServerOption) (*Server, error) {
 		options.httpTubeFact = contube.NewHttpTubeFactory(context.Background())
 		log.Info("Using the default HTTP tube factory")
 	}
-	options.managerOpts = []fs.ManagerOption{
+	options.managerOpts = append(options.managerOpts,
 		fs.WithTubeFactory("http", options.httpTubeFact),
-	}
-
-	options.managerOpts = append(options.managerOpts, fs.WithLogger(log.Logger))
+		fs.WithLogger(log.Logger))
 
 	// Config Tube Factory
 	if tubeFactories, err := setupFactories(options.tubeFactoryBuilders, options.tubeConfig); err == nil {