status-im
/
status-lib-archived
mirror of https://github.com/status-im/status-lib-archived.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

better debug messages

This commit is contained in:
michaelr 2016-04-11 15:38:57 +03:00
parent 21da6d7ce4
commit a416bf279d
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
protocol/src/cljs/syng_im/protocol/api.cljs
View File

@ -57,7 +57,7 @@
:msg-acked [msg-id from] :msg-acked [msg-id from]
:delivery-failed [msg-id] :delivery-failed [msg-id]
:new-group-chat [from group-id] :new-group-chat [from group-id]
:group-chat-invite-acked [from group-id] :group-chat-invite-acked [ack-msg-id from group-id]
:group-new-participant [identity group-id] :group-new-participant [identity group-id]
:group-removed-participant [from identity group-id] :group-removed-participant [from identity group-id]
:removed-from-group [from group-id] :removed-from-group [from group-id]

6
protocol/src/cljs/syng_im/protocol/handler.cljs
View File

@ -4,6 +4,7 @@
[syng-im.utils.encryption :refer [decrypt]] [syng-im.utils.encryption :refer [decrypt]]
[syng-im.protocol.state.state :as state :refer [storage]] [syng-im.protocol.state.state :as state :refer [storage]]
[syng-im.protocol.state.delivery :refer [internal? [syng-im.protocol.state.delivery :refer [internal?
pending?
update-pending-message]] update-pending-message]]
[syng-im.protocol.state.group-chat :refer [save-keypair [syng-im.protocol.state.group-chat :refer [save-keypair
save-identities save-identities
@ -24,8 +25,10 @@
[syng-im.protocol.user-handler :refer [invoke-user-handler]] [syng-im.protocol.user-handler :refer [invoke-user-handler]]
[syng-im.protocol.defaults :refer [default-content-type]])) [syng-im.protocol.defaults :refer [default-content-type]]))
(defn handle-ack [from {:keys [ack-msg-id] :as payload}] (defn handle-ack [from {:keys [ack-msg-id msg-id] :as payload}]
(log/info "Got ack for message:" ack-msg-id "from:" from) (log/info "Got ack for message:" ack-msg-id "from:" from)
(when-not (pending? ack-msg-id)
(log/info "Got ack for message" ack-msg-id "which isn't pending."))
(let [internal-message? (internal? ack-msg-id)] (let [internal-message? (internal? ack-msg-id)]
(update-pending-message ack-msg-id from) (update-pending-message ack-msg-id from)
(when-not internal-message? (when-not internal-message?
@ -33,6 +36,7 @@
:from from})) :from from}))
(when-let [group-topic (payload :group-invite)] (when-let [group-topic (payload :group-invite)]
(invoke-user-handler :group-chat-invite-acked {:from from (invoke-user-handler :group-chat-invite-acked {:from from
:ack-msg-id msg-id
:group-id group-topic})))) :group-id group-topic}))))
(defn send-ack (defn send-ack

1
protocol/src/cljs/syng_im/protocol/state/delivery.cljs
View File

@ -19,6 +19,7 @@
(defn add-pending-message (defn add-pending-message
([msg-id msg {:keys [identities internal?] :as opts}] ([msg-id msg {:keys [identities internal?] :as opts}]
(log/debug "add-pending-message" msg-id msg identities internal?)
(swap! state (fn [state] (swap! state (fn [state]
(-> (assoc-in state [:pending-messages msg-id] {:msg msg (-> (assoc-in state [:pending-messages msg-id] {:msg msg
:retry-count 0 :retry-count 0