From 3f5b5ff5e71cf078c2c04906bffa06f3a1050085 Mon Sep 17 00:00:00 2001 From: Ebus-at-dockstar Date: Fri, 25 Jul 2014 22:14:40 +0200 Subject: add tcp repl to inserter --- ebus-racket/inserter.rkt | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'ebus-racket/inserter.rkt') diff --git a/ebus-racket/inserter.rkt b/ebus-racket/inserter.rkt index a5a7ac8..cd05ad9 100755 --- a/ebus-racket/inserter.rkt +++ b/ebus-racket/inserter.rkt @@ -1,10 +1,11 @@ #! /usr/bin/env racket #lang racket/base (require racket/cmdline - racket/stream racket/tcp + racket/stream net/url "ebus/layer7.rkt" + "util/tcp-repl.rkt" "util/json.rkt") (define logger (make-logger 'ebus-inserter (current-logger))) @@ -12,7 +13,7 @@ (define connect-host? (make-parameter null)) (define connect-port? (make-parameter null)) (define insert? (make-parameter #f)) -(define baseurl? (make-parameter "http://localhost:8080/api")) +(define baseurl? (make-parameter "http://localhost:8000/sensor")) ;; Send field and value to database server (define (insert-field sensor-name datatype offset value) @@ -20,14 +21,19 @@ ((member datatype (list "bit" "byte" "data1b" "word" "bcd")) "int") ((member datatype (list "byteEnum")) "string"))) (set! value (cond ((string=? type "float") (real->decimal-string value)) - ((string=? type "int") (number->string value)) (else value))) - (put-pure-port - (string->url (format "~a/value/~a" (baseurl?) sensor-name)) - (string->bytes/utf-8 value))) + (define response + (read-line (put-pure-port + (string->url (format "~a/~a" (baseurl?) sensor-name)) + (string->bytes/utf-8 (format "value=~a&type=~a" value type))))) + (define responseJson (string->jsexpr response)) + (cond ((eq? (json-null) (hash-ref responseJson 'error)) + (log-message logger 'debug (format "Successful insert: type=~a value=~a" + type value) #t)) + (else (log-message logger 'error (format "Error: type=~a value=~a ERROR:~a" + type value response) #t)))) (define (handle-packet packet) - (for ([field packet]) (log-message logger 'info (format "Field: ~a" field) #t) (when (insert?) @@ -48,6 +54,8 @@ [("-c" "--connect") host port "Connect to server " (connect-host? host) (connect-port? (string->number port))] + ["--tcp-repl" port "Open REPL on TCP " + (tcp-repl-run (namespace-anchor->namespace repl-ns-anchor) (string->number port))] ["--insert" "Do Insert into Database" (insert? #t)] ["--baseurl" url "Database server http url" -- cgit v1.2.1