@@ -11,6 +11,7 @@ import (
11
11
"github.com/rockbears/log"
12
12
13
13
"github.com/ovh/cds/sdk"
14
+ cdslog "github.com/ovh/cds/sdk/log"
14
15
)
15
16
16
17
// Find image ID from image name
@@ -53,7 +54,7 @@ func (h *HatcheryOpenstack) getSmallerFlavorThan(flavor flavors.Flavor) flavors.
53
54
54
55
func (h * HatcheryOpenstack ) getImages (ctx context.Context ) []images.Image {
55
56
t := time .Now ()
56
- defer log .Debug (ctx , "getImages(): %fs" , time .Since (t ).Seconds ())
57
+ defer func () { log .Debug (ctx , "getImages(): %fs" , time .Since (t ).Seconds ()) }( )
57
58
58
59
is , expired := h .cache .Getimages ()
59
60
if len (is ) > 0 && ! expired {
@@ -91,7 +92,7 @@ func (h *HatcheryOpenstack) refreshImagesCache(ctx context.Context) error {
91
92
92
93
func (h * HatcheryOpenstack ) getServers (ctx context.Context ) []servers.Server {
93
94
t := time .Now ()
94
- defer log .Debug (ctx , "getServers() : %fs" , time .Since (t ).Seconds ())
95
+ defer func () { log .Debug (ctx , "getServers() : %fs" , time .Since (t ).Seconds ()) }( )
95
96
96
97
srvs , expired := h .cache .GetServers ()
97
98
if len (srvs ) > 0 && ! expired {
@@ -107,6 +108,7 @@ func (h *HatcheryOpenstack) getServers(ctx context.Context) []servers.Server {
107
108
}
108
109
109
110
func (h * HatcheryOpenstack ) refreshServersCache (ctx context.Context ) error {
111
+ ctx = context .WithValue (ctx , cdslog .Component , "refreshServersCache" )
110
112
all , err := servers .List (h .openstackClient , nil ).AllPages ()
111
113
if err != nil {
112
114
return sdk .WrapError (err , "cannot list openstack servers" )
@@ -125,6 +127,7 @@ func (h *HatcheryOpenstack) refreshServersCache(ctx context.Context) error {
125
127
if workerHatcheryName == "" || workerHatcheryName != h .Name () {
126
128
continue
127
129
}
130
+ log .Info (ctx , "worker %q (status=%s) IP %q" , s .Name , s .Status , s .AccessIPv4 )
128
131
filteredServerList = append (filteredServerList , s )
129
132
}
130
133
0 commit comments