Merge pull request #1073 from urbit/hotfix

release ames timer hotfix
urbit · Feb 17, 2019 · 095a45f · 095a45f
2 parents b50928a + 09995cd
commit 095a45f
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 1 deletion.
diff --git a/app/hood.hoon b/app/hood.hoon
@@ -169,6 +169,7 @@
 ++  poke-helm-tlon-init-stream  (wrap poke-tlon-init-stream):from-helm
 ++  poke-helm-automass        (wrap poke-automass):from-helm
 ++  poke-helm-cancel-automass  (wrap poke-cancel-automass):from-helm
+++  poke-helm-bonk            (wrap poke-bonk):from-helm
 ++  poke-hood-sync            (wrap poke-sync):from-kiln
 ++  poke-kiln-commit          (wrap poke-commit):from-kiln
 ++  poke-kiln-info            (wrap poke-info):from-kiln

diff --git a/gen/hood/bonk.hoon b/gen/hood/bonk.hoon
@@ -0,0 +1,7 @@
+::  Helm: bonk ames
+::
+::::  /hoon/bonk/hood/gen
+  ::
+/?    310
+:-  %say
+|=({^ ~ ~} helm-bonk+~)
diff --git a/lib/hood/helm.hoon b/lib/hood/helm.hoon
@@ -37,7 +37,8 @@
 =+  sez=(fall (~(get by hoc) ost) $:session)
 =>  |%                                                  ::  arvo structures
     ++  card                                            ::
-      $%  {$conf wire dock $load ship term}             ::
+      $%  [%bonk wire ~]                                ::
+          {$conf wire dock $load ship term}             ::
           {$flog wire flog:dill}                        ::
           [%mint wire our=ship p=ship q=safe:rights:jael]
           {$nuke wire ship}                             ::
@@ -106,6 +107,12 @@
   |=  ~
   abet:(emit %rest way.mass-timer.sez nex.mass-timer.sez)
 ::
+++  poke-bonk
+  |=  ~
+  ~&  .^((unit @da) %a /(scot %p our)/time/(scot %da now)/(scot %p our))
+  %-  %-  slog  :_  ~  .^(tank %b /(scot %p our)/timers/(scot %da now))
+  abet:(emit %bonk /bonk ~)
+::
 ++  take-wake-automass
   |=  [way=wire ~]
   =.  nex.mass-timer.sez  (add now tim.mass-timer.sez)

diff --git a/sys/vane/ames.hoon b/sys/vane/ames.hoon
@@ -1331,6 +1331,8 @@
     ::
         %pito
       :_  fox(tim `p.bon)
+      %-  flop
+      ^-  (list move)
       :-  [gad.fox %pass /ames %b %wait p.bon]
       ?~  tim.fox  ~
       [gad.fox %pass /ames %b %rest u.tim.fox]~
@@ -1461,6 +1463,13 @@
             %barn
           :_  fox(gad hen)
           [%bock ~]~
+        ::
+            %bonk
+          :_  fox
+          ?~  tim.fox
+            ~&  %ames-bonk-e
+            ~
+          [%pito u.tim.fox]~
         ::
             %hear
           (~(gnaw am [our now fox ski]) %good p.kyz q.kyz)
@@ -1543,6 +1552,10 @@
       ?.  =(our his)
         ~
       ``[%noun !>(pals:~(um am [our now fox ski]))]
+    ?:  ?=([%time ~] tyl)
+      ?.  =(our his)
+        ~
+      ``[%noun !>(tim.fox)]
     ~
   ::
   ++  wegh

diff --git a/sys/vane/gall.hoon b/sys/vane/gall.hoon
@@ -1258,6 +1258,7 @@
       ^-  (unit @tas)
       ?+  sep  ~&  [%ap-vain sep]
                ~
+        $bonk  `%a
         $build  `%f
         $cash  `%a
         $conf  `%g

diff --git a/sys/zuse.hoon b/sys/zuse.hoon
@@ -244,6 +244,7 @@
       ==  ==  ==                                        ::
     ++  task                                            ::  in request ->$
       $%  {$barn ~}                                    ::  new unix process
+          {$bonk ~}                                     ::  reset the timer
           {$crud p/@tas q/(list tank)}                  ::  error with trace
           {$hear p/lane q/@}                            ::  receive packet
           {$halo p/lane q/@ r/ares}                     ::  hole with trace