# HG changeset patch
# User Mahlon E. Smith <mahlon@martini.nu>
# Date 1635368236 25200
# Node ID d49437ff8f2f953a7100c4773cb0b9491965746d
# Parent  c568094abee7f245df07bd37d4ab904025162bf0
Updates for more recent (v1.6.0) nim.

diff -r c568094abee7 -r d49437ff8f2f mongrel2.nimble
--- a/mongrel2.nimble	Mon Oct 08 12:51:09 2018 -0700
+++ b/mongrel2.nimble	Wed Oct 27 13:57:16 2021 -0700
@@ -1,7 +1,7 @@
 
 # Package
 
-version       = "0.1.1"
+version       = "0.1.2"
 author        = "Mahlon E. Smith <mahlon@martini.nu>"
 description   = "Simplistic handler framework for the Mongrel2 webserver."
 license       = "MIT"
@@ -11,7 +11,7 @@
 
 # Dependencies
 
-requires "nim >= 0.19.0"
-requires "tnetstring >= 0.1.1"
-requires "zmq >= 0.2.1"
+requires "nim >= 1.4.0"
+requires "tnetstring >= 0.1.3"
+requires "zmq >= 1.2.1"
 
diff -r c568094abee7 -r d49437ff8f2f src/mongrel2.nim
--- a/src/mongrel2.nim	Mon Oct 08 12:51:09 2018 -0700
+++ b/src/mongrel2.nim	Wed Oct 27 13:57:16 2021 -0700
@@ -1,5 +1,6 @@
+# vim: set et sta sw=4 ts=4 :
 #
-# Copyright (c) 2015-2018, Mahlon E. Smith <mahlon@martini.nu>
+# Copyright (c) 2015-2021, Mahlon E. Smith <mahlon@martini.nu>
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -136,18 +137,18 @@
 
 
 import
-    json,
-    strutils,
-    tables,
-    times,
+    std/json,
+    std/strutils,
+    std/tables,
+    std/times,
     tnetstring,
     zmq
 
 type
     M2Handler* = ref object of RootObj
         handler_id:         string
-        request_sock:       TConnection
-        response_sock:      TConnection
+        request_sock:       ZConnection
+        response_sock:      ZConnection
         action*:            proc ( request: M2Request ): M2Response
         disconnect_action*: proc ( request: M2Request )
 
@@ -620,6 +621,11 @@
     result.body              = DEFAULT_CONTENT
 
 
+proc handle_disconnect( request: M2Request ): void =
+    ## This is the default disconnect handler, if the caller didn't install one.
+    return
+
+
 proc run*( handler: M2Handler ) {. noreturn .} =
     ## Enter the request loop conversation with Mongrel2.
     ## If an action() proc is attached, run that to generate
@@ -636,9 +642,9 @@
         # disconnect_action.
         #
         if request.is_disconnect:
-            if not isNil( handler.disconnect_action ):
-                discard handler.disconnect_action
-            continue
+            if isNil( handler.disconnect_action ):
+                handler.disconnect_action = handle_disconnect
+            handler.disconnect_action( request )
 
         # Defer regular response content to the handler action.
         #
@@ -659,7 +665,7 @@
         ]
 
         echo "$1: $2 --> $3 $4" % [
-            $(get_localtime(getTime())),
+            $(get_time()),
             info,
             $( response.status ),
             HTTPCODE[ response.status ].label