Rename vsm.AttachTmo() to .Timeout().

pkg/admin/admin.go

@@ -329,7 +329,7 @@ func Attach(name string, timeout time.Duration) (*Admin, error) {
 		return nil, errors.New("Cannot initialize for attachment")
 	}
 	defer vsm.Destroy()
-	if err := vsm.AttachTmo(timeout); err != nil {
+	if err := vsm.Timeout(timeout); err != nil {
 		return nil, err
 	}
 	if err := vsm.Attach(name); err != nil {

pkg/log/log.go

@@ -155,7 +155,7 @@ func (log *Log) Timeout(tmo time.Duration) error {
 	if err := log.initVSM(); err != nil {
 		return err
 	}
-	return log.vsm.AttachTmo(tmo)
+	return log.vsm.Timeout(tmo)
 }
 
 // Attach to an instance of Varnish -- varnishd with a running worker

pkg/stats/stats.go

@@ -272,7 +272,7 @@ func (stats *Stats) Timeout(tmo time.Duration) error {
 	if err := stats.initVSM(); err != nil {
 		return err
 	}
-	return stats.vsm.AttachTmo(tmo)
+	return stats.vsm.Timeout(tmo)
 }
 
 func (stats *Stats) clude(nmGlob string, exclude bool) error {

pkg/vsm/e2e_test.go

@@ -100,22 +100,22 @@ func TestAttach(t *testing.T) {
 
 const zerosec = time.Duration(0)
 
-func TestAttachTmo(t *testing.T) {
+func TestTimeout(t *testing.T) {
 	v := New()
 	defer v.Destroy()
 	for _, s := range []int{0, 1, -1, ^0, int(^uint(0) >> 1)} {
-		if e := v.AttachTmo(time.Duration(s) * time.Second); e != nil {
-			t.Error("AttachTmo():", e)
+		if e := v.Timeout(time.Duration(s) * time.Second); e != nil {
+			t.Error("Timeout():", e)
 		}
 	}
 
 	var n *VSM
-	if err := n.AttachTmo(zerosec); err == nil {
-		t.Error("expected nil.AttachTmo() to fail")
+	if err := n.Timeout(zerosec); err == nil {
+		t.Error("expected nil.Timeout() to fail")
 	}
 	uninit := new(VSM)
-	if err := uninit.AttachTmo(zerosec); err == nil {
-		t.Error("expected uninitialized.AttachTmo() to fail")
+	if err := uninit.Timeout(zerosec); err == nil {
+		t.Error("expected uninitialized.Timeout() to fail")
 	}
 }
 
@@ -128,8 +128,8 @@ func TestAttachInstance(t *testing.T) {
 
 	f := New()
 	defer f.Destroy()
-	if err := f.AttachTmo(zerosec); err != nil {
-		t.Error("AttachTmo(0s):", err)
+	if err := f.Timeout(zerosec); err != nil {
+		t.Error("Timeout(0s):", err)
 	}
 	if err := f.Attach("instanceDoesNotExist"); err == nil {
 		t.Error("expected Attach() to fail for a " +

pkg/vsm/vsm.go

@@ -118,12 +118,12 @@ func (v *VSM) Error() string {
 	return C.GoString(C.VSM_Error(v.VSM))
 }
 
-// AttachTmo sets the timeout for attaching to a Varnish instance. If
+// Timeout sets the timeout for attaching to a Varnish instance. If
 // the Duration, truncated to seconds, is >= 0s, then wait that many
 // seconds to attach. If the Duration < 0s, wait indefinitely. By
 // default, the Varnish default timeout holds (5s in recent Varnish
 // versions).
-func (v *VSM) AttachTmo(tmo time.Duration) error {
+func (v *VSM) Timeout(tmo time.Duration) error {
 	if err := v.checkNil(); err != nil {
 		return err
 	}