with-logging should not take a DEBUG level

diff --git a/basis/io/servers/connection/connection.factor b/basis/io/servers/connection/connection.factor
index 91fb3bfb37bea0c2c32ffcc4f6f4a4f55c164425..589a50d2ebf58063d4e25f1813150fdf766ea77f 100644 (file)
--- a/basis/io/servers/connection/connection.factor
+++ b/basis/io/servers/connection/connection.factor
@@ -117,7 +117,7 @@ M: threaded-server handle-client* handler>> call ;
 : (start-server) ( threaded-server -- )
     init-server
     dup threaded-server [
-        [ ] [ name>> ] [ log-level>> ] tri [
+        [ ] [ name>> ] bi [
             [ listen-on [ start-accept-loop ] parallel-each ]
             [ ready>> raise-flag ]
             bi

diff --git a/basis/io/servers/packet/packet.factor b/basis/io/servers/packet/packet.factor
index 3f092ab9f1c7ec9b813cbcd4592f0ad7d670ee8f..4edffa96b73cb06c6d0bb74f193ca8f2e2598c5d 100644 (file)
--- a/basis/io/servers/packet/packet.factor
+++ b/basis/io/servers/packet/packet.factor
@@ -20,5 +20,4 @@ LOG: received-datagram NOTICE
 PRIVATE>
 
 : with-datagrams ( seq service quot -- )
-    [ DEBUG ] dip
     '[ [ [ _ ] dip spawn-datagrams ] parallel-each ] with-logging ; inline

diff --git a/basis/logging/insomniac/insomniac.factor b/basis/logging/insomniac/insomniac.factor
index 935326da2d45eea602a97fb45cfbbaf1c406a33c..91baae631f507dfdeea5f92fac3c954e3d1762cd 100644 (file)
--- a/basis/logging/insomniac/insomniac.factor
+++ b/basis/logging/insomniac/insomniac.factor
@@ -30,7 +30,7 @@ SYMBOL: insomniac-recipients
 \ (email-log-report) NOTICE add-error-logging\r
 \r
 : email-log-report ( service word-names -- )\r
-    "logging.insomniac" DEBUG [ (email-log-report) ] with-logging ;\r
+    "logging.insomniac" [ (email-log-report) ] with-logging ;\r
 \r
 : schedule-insomniac ( service word-names -- )\r
     [ [ email-log-report ] assoc-each rotate-logs ] 2curry\r

diff --git a/basis/logging/logging-docs.factor b/basis/logging/logging-docs.factor
index 64956493c6ff4896fb561334872b99a7fcdbbec2..a4b3f3f019998f879827a5538a3cc890fb1fbe30 100644 (file)
--- a/basis/logging/logging-docs.factor
+++ b/basis/logging/logging-docs.factor
@@ -94,7 +94,7 @@ HELP: close-logs
 { $description "Closes all open log streams. Subsequent logging will re-open the streams. This should be used before moving or deleting log files." } ;
 
 HELP: with-logging
-{ $values { "service" "a log service name" } { "level" "a log level" } { "quot" quotation } }
+{ $values { "service" "a log service name" } { "quot" quotation } }
 { $description "Calls the quotation a new dynamic scope where all logging calls more urgent than " { $link log-level } " are sent to the log file for " { $snippet "service" } "." } ;
 
 ARTICLE: "logging.rotation" "Log rotation"

diff --git a/basis/logging/logging-tests.factor b/basis/logging/logging-tests.factor
index 63eecc73191ee1cfd6bd4f051c0dd099c4289bf1..796c8769fc295febb25e4c7a84dddb41bce993fa 100644 (file)
--- a/basis/logging/logging-tests.factor
+++ b/basis/logging/logging-tests.factor
@@ -13,7 +13,7 @@ USING: tools.test logging math ;
 
 \ error-logging-test ERROR add-error-logging
 
-"logging-test" DEBUG [
+"logging-test" [
     [ 4 ] [ 1 3 input-logging-test ] unit-test
     
     [ 4 ] [ 1 3 output-logging-test ] unit-test

diff --git a/basis/logging/logging.factor b/basis/logging/logging.factor
index 496dae2c612fb59cc4d8e58613be8562592abbcd..ff1baa4ebbb717bf402fa00c13b2bf2d0d8b93ba 100644 (file)
--- a/basis/logging/logging.factor
+++ b/basis/logging/logging.factor
@@ -55,10 +55,8 @@ ERROR: bad-log-message-parameters msg word level ;
 : close-logs ( -- )\r
     { } "close-logs" send-to-log-server ;\r
 \r
-: with-logging ( service level quot -- )\r
-    '[\r
-        _ log-service [ _ log-level _ with-variable ] with-variable\r
-    ] call ; inline\r
+: with-logging ( service quot -- )\r
+    [ log-service ] dip with-variable ; inline\r
 \r
 ! Aspect-oriented programming idioms\r
 \r

diff --git a/extra/spider/spider.factor b/extra/spider/spider.factor
index 0f702d7d22f9f71f4fdd9e0522d57bb5eb228b93..bd5b2668bead07fab6ef5e747e5dd196c84d53a9 100644 (file)
--- a/extra/spider/spider.factor
+++ b/extra/spider/spider.factor
@@ -88,7 +88,7 @@ links processing-time timestamp ;
 PRIVATE>
 
 : run-spider ( spider -- spider )
-    "spider" DEBUG [
+    "spider" [
         dup spider [
             queue-initial-links
             [ todo>> ] [ max-depth>> ] bi