@@ -6,23 +6,17 @@ import (
66 "fmt"
77 "net"
88 "net/http"
9- "os"
10- "os/signal"
119 "strings"
12- "syscall"
1310
1411 "paperdebugger/internal/libs/logger"
1512 "paperdebugger/internal/libs/metadatautil"
1613 "paperdebugger/internal/libs/shared"
17- "paperdebugger/internal/services"
18- aiclient "paperdebugger/internal/services/toolkit/client"
1914 authv1 "paperdebugger/pkg/gen/api/auth/v1"
2015 chatv1 "paperdebugger/pkg/gen/api/chat/v1"
2116 chatv2 "paperdebugger/pkg/gen/api/chat/v2"
2217 commentv1 "paperdebugger/pkg/gen/api/comment/v1"
2318 projectv1 "paperdebugger/pkg/gen/api/project/v1"
2419 sharedv1 "paperdebugger/pkg/gen/api/shared/v1"
25- usagev1 "paperdebugger/pkg/gen/api/usage/v1"
2620 userv1 "paperdebugger/pkg/gen/api/user/v1"
2721
2822 "github.com/gin-gonic/gin"
@@ -36,37 +30,25 @@ import (
3630)
3731
3832type Server struct {
39- grpcServer * GrpcServer
40- ginServer * GinServer
41- pricingService * services.PricingService
42- aiClientV2 * aiclient.AIClientV2
33+ grpcServer * GrpcServer
34+ ginServer * GinServer
4335
4436 logger * logger.Logger
4537}
4638
4739func NewServer (
4840 grpcServer * GrpcServer ,
4941 ginServer * GinServer ,
50- pricingService * services.PricingService ,
51- aiClientV2 * aiclient.AIClientV2 ,
5242 logger * logger.Logger ,
5343) * Server {
5444 return & Server {
55- grpcServer : grpcServer ,
56- ginServer : ginServer ,
57- pricingService : pricingService ,
58- aiClientV2 : aiClientV2 ,
59- logger : logger ,
45+ grpcServer : grpcServer ,
46+ ginServer : ginServer ,
47+ logger : logger ,
6048 }
6149}
6250
6351func (s * Server ) Run (addr string ) {
64- // Start the pricing updater in the background
65- ctx , cancel := context .WithCancel (context .Background ())
66- defer cancel ()
67-
68- s .pricingService .StartPriceUpdater (ctx )
69-
7052 listener , err := net .Listen ("tcp" , ":0" )
7153 if err != nil {
7254 s .logger .Fatalf ("failed to start grpc server listener: %v" , err )
@@ -123,22 +105,6 @@ func (s *Server) Run(addr string) {
123105 s .logger .Fatalf ("failed to register comment service grpc gateway: %v" , err )
124106 return
125107 }
126- err = usagev1 .RegisterUsageServiceHandler (context .Background (), mux , client )
127- if err != nil {
128- s .logger .Fatalf ("failed to register usage service grpc gateway: %v" , err )
129- return
130- }
131-
132- // Set up signal handling for graceful shutdown
133- sigChan := make (chan os.Signal , 1 )
134- signal .Notify (sigChan , syscall .SIGINT , syscall .SIGTERM )
135-
136- go func () {
137- <- sigChan
138- s .logger .Info ("[PAPERDEBUGGER] received shutdown signal, shutting down gracefully..." )
139- s .Shutdown ()
140- os .Exit (0 )
141- }()
142108
143109 s .logger .Infof ("[PAPERDEBUGGER] http server listening on %s" , addr )
144110 s .ginServer .Any ("/_pd/api/*path" , func (c * gin.Context ) { mux .ServeHTTP (c .Writer , c .Request ) })
@@ -148,16 +114,6 @@ func (s *Server) Run(addr string) {
148114 }
149115}
150116
151- // Shutdown gracefully shuts down all server components.
152- func (s * Server ) Shutdown () {
153- s .logger .Info ("[PAPERDEBUGGER] shutting down AI client (draining usage records)..." )
154- s .aiClientV2 .Shutdown ()
155- s .logger .Info ("[PAPERDEBUGGER] AI client shutdown complete" )
156-
157- s .grpcServer .GracefulStop ()
158- s .logger .Info ("[PAPERDEBUGGER] gRPC server shutdown complete" )
159- }
160-
161117func (s * Server ) metadataAnnotator () func (ctx context.Context , req * http.Request ) metadata.MD {
162118 return func (ctx context.Context , req * http.Request ) metadata.MD {
163119 md := metadata .New (map [string ]string {})
0 commit comments