@@ -3,7 +3,6 @@ package transport
33import (
44 "context"
55 "fmt"
6- "log"
76 "net"
87 "sort"
98 "strconv"
@@ -160,7 +159,7 @@ func NewCluster(ctx context.Context, cfg ConnConfig, p HostSelectionPolicy, e []
160159}
161160
162161func (c * Cluster ) NewControl (ctx context.Context ) (* Conn , error ) {
163- log . Printf ("cluster: open control connection" )
162+ c . cfg . Logger . Info ("cluster: open control connection" )
164163 var errs []string
165164 for addr := range c .knownHosts {
166165 conn , err := OpenConn (ctx , addr , nil , c .cfg )
@@ -184,7 +183,7 @@ func (c *Cluster) NewControl(ctx context.Context) (*Conn, error) {
184183// refreshTopology creates new topology filled with the result of keyspaceQuery, localQuery and peerQuery.
185184// Old topology is replaced with the new one atomically to prevent dirty reads.
186185func (c * Cluster ) refreshTopology (ctx context.Context ) error {
187- log . Printf ("cluster: refresh topology" )
186+ c . cfg . Logger . Infoln ("cluster: refresh topology" )
188187 rows , err := c .getAllNodesInfo (ctx )
189188 if err != nil {
190189 return fmt .Errorf ("query info about nodes in cluster: %w" , err )
@@ -236,9 +235,9 @@ func (c *Cluster) refreshTopology(ctx context.Context) error {
236235 }
237236
238237 if ks , ok := t .keyspaces [c .cfg .Keyspace ]; ok {
239- t .policyInfo .Preprocess (t , ks )
238+ t .policyInfo .Preprocess (t , ks , c . cfg . Logger )
240239 } else {
241- t .policyInfo .Preprocess (t , keyspace {})
240+ t .policyInfo .Preprocess (t , keyspace {}, c . cfg . Logger )
242241 }
243242
244243 c .setTopology (t )
@@ -450,7 +449,7 @@ func (c *Cluster) setTopology(t *topology) {
450449// of registering handlers for them.
451450func (c * Cluster ) handleEvent (ctx context.Context , r response ) {
452451 if r .Err != nil {
453- log . Printf ("cluster: received event with error: %v" , r .Err )
452+ c . cfg . Logger . Infoln ("cluster: received event with error: %v" , r .Err )
454453 c .RequestReopenControl ()
455454 return
456455 }
@@ -462,17 +461,17 @@ func (c *Cluster) handleEvent(ctx context.Context, r response) {
462461 case * SchemaChange :
463462 // TODO: add schema change.
464463 default :
465- log . Printf ("cluster: unsupported event type: %v" , r .Response )
464+ c . cfg . Logger . Warnf ("cluster: unsupported event type: %v" , r .Response )
466465 }
467466}
468467
469468func (c * Cluster ) handleTopologyChange (v * TopologyChange ) {
470- log . Printf ("cluster: handle topology change: %+#v" , v )
469+ c . cfg . Logger . Infof ("cluster: handle topology change: %+#v" , v )
471470 c .RequestRefresh ()
472471}
473472
474473func (c * Cluster ) handleStatusChange (ctx context.Context , v * StatusChange ) {
475- log . Printf ("cluster: handle status change: %+#v" , v )
474+ c . cfg . Logger . Infof ("cluster: handle status change: %+#v" , v )
476475 m := c .Topology ().peers
477476 addr := v .Address .String ()
478477 if n , ok := m [addr ]; ok {
@@ -482,10 +481,10 @@ func (c *Cluster) handleStatusChange(ctx context.Context, v *StatusChange) {
482481 case frame .Down :
483482 n .setStatus (statusDown )
484483 default :
485- log . Printf ("cluster: status change not supported: %+#v" , v )
484+ c . cfg . Logger . Warnf ("cluster: status change not supported: %+#v" , v )
486485 }
487486 } else {
488- log . Printf ("cluster: unknown node %s received status change: %+#v in topology %v" , addr , v , m )
487+ c . cfg . Logger . Infof ("cluster: unknown node %s received status change: %+#v in topology %v, requesting topology refresh " , addr , v , m )
489488 c .RequestRefresh ()
490489 }
491490}
@@ -503,7 +502,7 @@ func (c *Cluster) loop(ctx context.Context) {
503502 case <- c .reopenControlChan :
504503 c .tryReopenControl (ctx )
505504 case <- ctx .Done ():
506- log . Printf ("cluster closing due to: %v" , ctx .Err ())
505+ c . cfg . Logger . Infof ("cluster closing due to: %v" , ctx .Err ())
507506 c .handleClose ()
508507 return
509508 case <- c .closeChan :
@@ -523,17 +522,17 @@ func (c *Cluster) tryRefresh(ctx context.Context) {
523522 if err := c .refreshTopology (ctx ); err != nil {
524523 c .RequestReopenControl ()
525524 time .AfterFunc (tryRefreshInterval , c .RequestRefresh )
526- log . Printf ("cluster: refresh topology: %v" , err )
525+ c . cfg . Logger . Infof ("cluster: refresh topology: %v" , err )
527526 }
528527}
529528
530529const tryReopenControlInterval = time .Second
531530
532531func (c * Cluster ) tryReopenControl (ctx context.Context ) {
533- log . Printf ("cluster: reopen control connection" )
532+ c . cfg . Logger . Infoln ("cluster: reopen control connection" )
534533 if control , err := c .NewControl (ctx ); err != nil {
535534 time .AfterFunc (tryReopenControlInterval , c .RequestReopenControl )
536- log . Printf ("cluster: failed to reopen control connection: %v" , err )
535+ c . cfg . Logger . Infof ("cluster: failed to reopen control connection: %v" , err )
537536 } else {
538537 c .control .Close ()
539538 c .control = control
@@ -542,7 +541,7 @@ func (c *Cluster) tryReopenControl(ctx context.Context) {
542541}
543542
544543func (c * Cluster ) handleClose () {
545- log . Printf ("cluster: handle cluster close" )
544+ c . cfg . Logger . Infoln ("cluster: handle cluster close" )
546545 c .control .Close ()
547546 m := c .Topology ().peers
548547 for _ , n := range m {
@@ -551,23 +550,23 @@ func (c *Cluster) handleClose() {
551550}
552551
553552func (c * Cluster ) RequestRefresh () {
554- log . Printf ("cluster: requested to refresh cluster topology" )
553+ c . cfg . Logger . Infoln ("cluster: requested to refresh cluster topology" )
555554 select {
556555 case c .refreshChan <- struct {}{}:
557556 default :
558557 }
559558}
560559
561560func (c * Cluster ) RequestReopenControl () {
562- log . Printf ("cluster: requested to reopen control connection" )
561+ c . cfg . Logger . Infoln ("cluster: requested to reopen control connection" )
563562 select {
564563 case c .reopenControlChan <- struct {}{}:
565564 default :
566565 }
567566}
568567
569568func (c * Cluster ) Close () {
570- log . Printf ("cluster: requested to close cluster" )
569+ c . cfg . Logger . Infoln ("cluster: requested to close cluster" )
571570 select {
572571 case c .closeChan <- struct {}{}:
573572 default :
0 commit comments