|
44 | 44 | class_name = sub.class_name |
45 | 45 | queue = sub.queue_name |
46 | 46 | filters = sub.matcher.filters |
| 47 | + sub_key = sub.key |
47 | 48 |
|
48 | 49 | if filters["bus_event_type"] |
49 | 50 | event = filters["bus_event_type"] |
|
52 | 53 | end |
53 | 54 |
|
54 | 55 | app_hash[app_key] ||= [] |
55 | | - app_hash[app_key] << [event, class_name, queue, filters] |
| 56 | + app_hash[app_key] << [sub_key, event, class_name, queue, filters] |
56 | 57 |
|
57 | 58 | class_hash[class_name] ||= [] |
58 | | - class_hash[class_name] << [app_key, event, queue, filters] |
| 59 | + class_hash[class_name] << [app_key, sub_key, event, queue, filters] |
59 | 60 |
|
60 | 61 | event_hash[event] ||= [] |
61 | | - event_hash[event] << [app_key, class_name, queue, filters] |
| 62 | + event_hash[event] << [app_key, sub_key, class_name, queue, filters] |
62 | 63 | end |
63 | 64 | end |
64 | 65 |
|
|
81 | 82 | if !val |
82 | 83 | out = "<td> </td><td> </td>" |
83 | 84 | else |
84 | | - one, two, queue, filters = val |
85 | | - out = "<td>#{h(one)}</td><td>#{h(two)}</td><td><a href='#{u("queues/#{queue}")}'>#{h(queue)}</a></td>" |
| 85 | + one, two, three, queue, filters = val |
| 86 | + out = "<td>#{h(one)}</td><td>#{h(two)}</td><td>#{h(three)}</td><td><a href='#{u("queues/#{queue}")}'>#{h(queue)}</a></td>" |
86 | 87 | out << "<td>#{h(::QueueBus::Util.encode(filters).gsub(/\"bus_special_value_(\w+)\"/){ "(#{$1})" }).gsub(" ", " ").gsub('","', '", "')}</td>" |
87 | 88 | end |
88 | 89 |
|
|
138 | 139 | <table class='queues'> |
139 | 140 | <tr> |
140 | 141 | <th>App Key</th> |
| 142 | + <th>Subscription Key</th> |
141 | 143 | <th>Event Type</th> |
142 | 144 | <th>Class Name</th> |
143 | 145 | <th>Queue</th> |
|
155 | 157 | <tr> |
156 | 158 | <th>Event Type</th> |
157 | 159 | <th>App Key</th> |
| 160 | + <th>Subscription Key</th> |
158 | 161 | <th>Class Name</th> |
159 | 162 | <th>Queue</th> |
160 | 163 | <th>Filters</th> |
|
172 | 175 | <tr> |
173 | 176 | <th>Class Name</th> |
174 | 177 | <th>App Key</th> |
| 178 | + <th>Subscription Key</th> |
175 | 179 | <th>Event Type</th> |
176 | 180 | <th>Queue</th> |
177 | 181 | <th>Filters</th> |
|
0 commit comments