t.transactionXappTable = make(map[TransactionXappKey]*Transaction)
}
-func (t *Tracker) TrackTransaction(subs *Subscription, endpoint RmrEndpoint, params *xapp.RMRParams, respReceived bool, forwardRespToXapp bool) (*Transaction, error) {
+func (t *Tracker) TrackTransaction(
+ endpoint *RmrEndpoint,
+ xid string,
+ meid *xapp.RMRMeid,
+ respReceived bool,
+ forwardRespToXapp bool) (*Transaction, error) {
+
+ if endpoint == nil {
+ err := fmt.Errorf("Tracker: No valid endpoint given")
+ return nil, err
+ }
trans := &Transaction{
tracker: nil,
Subs: nil,
- RmrEndpoint: endpoint,
- Xid: params.Xid,
- OrigParams: params,
+ RmrEndpoint: *endpoint,
+ Xid: xid,
+ Meid: meid,
RespReceived: respReceived,
ForwardRespToXapp: forwardRespToXapp,
}
t.mutex.Lock()
defer t.mutex.Unlock()
- xappkey := TransactionXappKey{endpoint, params.Xid}
- if _, ok := t.transactionXappTable[xappkey]; ok {
- err := fmt.Errorf("Tracker: Similar transaction with xappkey %s is ongoing, transaction %s not created ", xappkey, trans)
+ xappkey := TransactionXappKey{*endpoint, xid}
+ if othtrans, ok := t.transactionXappTable[xappkey]; ok {
+ err := fmt.Errorf("Tracker: %s is ongoing, %s not created ", othtrans, trans)
return nil, err
}
- err := subs.SetTransaction(trans)
- if err != nil {
- return nil, err
- }
trans.tracker = t
t.transactionXappTable[xappkey] = trans
+ xapp.Logger.Info("Tracker: Create %s", trans.String())
+ xapp.Logger.Debug("Tracker: transtable=%v", t.transactionXappTable)
return trans, nil
}
t.mutex.Lock()
defer t.mutex.Unlock()
if trans, ok2 := t.transactionXappTable[xappKey]; ok2 {
+ xapp.Logger.Info("Tracker: Delete %s", trans.String())
delete(t.transactionXappTable, xappKey)
+ xapp.Logger.Debug("Tracker: transtable=%v", t.transactionXappTable)
return trans, nil
}
- return nil, fmt.Errorf("Tracker: No record for xappkey %s", xappKey)
+ return nil, fmt.Errorf("Tracker: No record %s", xappKey)
}