Commit b0cd3673 authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

fixed expiry timer

parent 58ff9205

go-apps/meep-wais/server/wais.go

+2 −2
Original line number Diff line number Diff line
@@ -1395,7 +1395,7 @@ func newAssocStaSubscriptionCfg(sub *AssocStaSubscription, subId string) *sm.Sub 
	}

	var expiryTime *time.Time

	if sub.ExpiryDeadline != nil {

		expiry := time.Unix(int64(sub.ExpiryDeadline.Seconds), int64(sub.ExpiryDeadline.NanoSeconds))

		expiry := time.Unix(int64(sub.ExpiryDeadline.Seconds), 0)

		expiryTime = &expiry

	}

	subCfg := &sm.SubscriptionCfg{
@@ -1433,7 +1433,7 @@ func ExpiredSubscriptionCb(sub *sm.Subscription) { 
		},

		ExpiryDeadline: &TimeStamp{

			Seconds:     int32(sub.Cfg.ExpiryTime.Unix()),

			NanoSeconds: int32(sub.Cfg.ExpiryTime.UnixNano()),

			NanoSeconds: 0,

		},

	}

go-packages/meep-subscriptions/subscription-mgr.go

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ func (sm *SubscriptionMgr) runTicker() { 
			if sub.State == StateExpired {

				// Add to list of expired subscriptions

				expiredSubList = append(expiredSubList, sub)

			} else if sub.ExpiryTime != nil && currentTime.After(*sub.ExpiryTime) {

			} else if sub.Cfg.ExpiryTime != nil && currentTime.After(*sub.Cfg.ExpiryTime) {

				// Set state to expired & invoke expiry callback

				sub.State = StateExpired

go-packages/meep-subscriptions/subscription.go

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ type Subscription struct { 
	JsonSubOrig     string       `json:"jsonSubOrig"`

	Mode            string       `json:"mode"`

	State           string       `json:"state"`

	ExpiryTime      *time.Time   `json:"expiryTime"`

	PeriodicCounter int32        `json:"periodicCounter"`

	TestNotifSent   bool         `json:"testNotifSent"`

	WsCreated       bool         `json:"wsCreated"`