Added Erlang demo.

Author: oubiwann

README.md

@@ -122,10 +122,11 @@ Here is some example LFE usage:
 (log-info #m(some "structured" logging "examples" might "be useful too")))
 ```
 
-## Demo
+## Demos
 
 ``` bash
-$ rebar3 as examples demo
+$ rebar3 as examples lfe-demo
+$ rebar3 as examples erlang-demo
 ```
 
 ## Test

examples/logjam-demo.lfe

@@ -5,29 +5,7 @@
 (include-lib "logjam/include/logjam.hrl")
 
 (defun run ()
-  ;; (io:format "~n*** Using the logger API ***~n~n")
-  ;; (logger:debug "This is a debug-level message")
-  ;; (logger:info "This is an info-level message")
-  ;; (logger:notice "This is a notice-level message")
-  ;; (logger:warning "This is a warning-level message")
-  ;; (logger:error "This is an error-level message")
-  ;; (logger:critical "This is a critical-level message")
-  ;; (logger:alert "This is an alert-level message")
-  ;; (logger:emergency "This is an emergency-level message")
-  ;; (logger:info #m(some "structured" logging "examples" might "be useful too"))
-
-  ;; (io:format "~n*** Using the logjam API ***~n~n")
-  ;; (logjam:debug "This is a debug-level message")
-  ;; (logjam:info "This is an info-level message")
-  ;; (logjam:notice "This is a notice-level message")
-  ;; (logjam:warning "This is a warning-level message")
-  ;; (logjam:error "This is an error-level message")
-  ;; (logjam:critical "This is a critical-level message")
-  ;; (logjam:alert "This is an alert-level message")
-  ;; (logjam:emergency "This is an emergency-level message")
-  ;; (logjam:info #m(some "structured" logging "examples" might "be useful too"))
-
-  (io:format "~n*** Using logjam's macros ***~n~n")
+  (io:format "~n*** Using logjam's macros from LFE ***~n~n")
   (log-debug "This is a debug-level message")
   (log-info "This is an info-level message")
   (log-notice "This is a notice-level message")

examples/logjam_demo.erl

@@ -2,24 +2,10 @@
 
 -export([run/0]).
 
-% -include_lib("kernel/include/logger.hrl").
-
-% run() ->
-%     ?'LOG_DEBUG'("This is a debug-level message"),
-%     ?LOG_INFO("This is a info-level message"),
-%     ?LOG_NOTICE("This is a notice-level message"),
-%     ?LOG_WARNING("This is a warning-level message"),
-%     ?LOG_ERROR("This is a error-level message"),
-%     ?LOG_CRITICAL("This is a critical-level message"),
-%     ?LOG_ALERT("This is a alert-level message"),
-%     ?LOG_EMERGENCY("This is a emergency-level message"),
-%     ?LOG_INFO(#{some => "structured",
-%                 logging => "examples",
-%                 might => "be useful too"}).
-
 -include_lib("logjam/include/logjam.hrl").
 
 run() ->
+    io:format("~n*** Using logjam's macros from Erlang ***~n~n"),
     ?'log-debug'("This is a debug-level message"),
     ?'log-info'("This is a info-level message"),
     ?'log-notice'("This is a notice-level message"),

rebar.config

@@ -35,7 +35,7 @@
         ]},
         {eunit_opts, [verbose]},
         {erl_opts, [
-            {src_dirs, ["src", "test"]}
+            {src_dirs, ["src", "examples", "test"]}
         ]}
     ]},
     {examples, [
@@ -66,8 +66,12 @@
         coverage,
          edoc
     ]},
-    {demo, [
+    {'lfe-demo', [
         compile,
-        {lfe, 'run', "-m scripts/demo.lfe -- ./config/dev.config"}
+        {lfe, 'run', "-m scripts/lfe-demo.lfe -- ./config/dev.config"}
+    ]},
+    {'erlang-demo', [
+        compile,
+        {lfe, 'run', "-m scripts/erlang-demo.lfe -- ./config/dev.config"}
     ]}
 ]}.

rebar.lock

@@ -0,0 +1,16 @@
+#! /usr/bin/env lfescript
+
+(include-lib "lfe/include/clj.lfe")
+
+(defun main
+  ((`(,config-file))
+   (timer:sleep 1000)
+   (logger:set_primary_config #m(level all))
+   (logjam:set-handler-from-config config-file)
+   (timer:sleep 500)
+   (logjam_demo:run)
+   (timer:sleep 1000)
+   (io:format "~n"))
+  ((args)
+   (io:format "One arguement is required for the demo: the path to a config file.~n")
+   (io:format "(Got ~p)~n" `(,args))))

scripts/erlang-demo.lfe

@@ -5,7 +5,14 @@
 ;;;; logger formatter regarding: max depth, templates.
 (defmodule logjam
   (export
-   (format 2))
+   (format 2)
+   (read-config 1)
+   (set-handler 1) (set-handler 2)
+   (set-handler-from-config 1) (set-handler-from-config 2)
+   ;; Aliases for Erlang users:
+   (read_config 1)
+   (set_handler 1) (set_handler 2)
+   (set_handler_from_config 1) (set_handler_from_config 2))
   (export-macro
    log debug info notice warn warning error critical alert emergency))
 
@@ -42,6 +49,48 @@
               'msg `#(report #m(text ,(logjam_formatter:format_to_binary format terms))))
             user-config)))
 
+(defun read-config (config-file)
+  "Read a standard release-style system config file.
+
+  Essentially wraps file:consult/1."
+  (let ((`#(ok (,cfg)) (file:consult config-file)))
+    cfg))
+
+(defun set-handler-from-config (config-file)
+   (set-handler (read-config config-file)))
+
+(defun set-handler-from-config (config-file name)
+   (set-handler name (read-config config-file)))
+
+(defun set-handler (config-data)
+  (set-handler config-data 'default))
+
+(defun set-handler (config-data name)
+  (logger:set_handler_config
+   name
+   (clj:->> config-data
+            (proplists:get_value 'kernel)
+            (proplists:get_value 'logger)
+            (car)
+            (element 4))))
+
+;; Aliases for Erlang users
+
+(defun read_config (config-file)
+  (read-config config-file))
+
+(defun set_handler_from_config (config-file)
+  (set-handler-from-config config-file))
+
+(defun set_handler_from_config (config-file name)
+  (set-handler-from-config config-file name))
+
+(defun set_handler (config-file)
+  (set-handler config-file))
+
+(defun set_handler (config-file name)
+  (set-handler config-file name))
+
 ;;;==========================================================================
 ;;; API macros
 ;;;==========================================================================