From: Tomek Mrugalski <tomasz@isc.org>
Date: Mon, 26 Oct 2015 19:52:28 +0000 (+0100)
Subject: [4081] Boilerplate logger added.
X-Git-Tag: trac4106_base~1^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f70950333796e756446c45d1901770b521d53a4;p=thirdparty%2Fkea.git

[4081] Boilerplate logger added.
---

diff --git a/src/lib/eval/Makefile.am b/src/lib/eval/Makefile.am
index e6893a129e..dba912d1b8 100644
--- a/src/lib/eval/Makefile.am
+++ b/src/lib/eval/Makefile.am
@@ -18,9 +18,18 @@ libkea_eval_la_LDFLAGS += $(CRYPTO_LDFLAGS)
 EXTRA_DIST  = eval.dox
 
 # Define rule to build logging source files from message file
-expr_messages.h expr_messages.cc: s-messages
+eval_messages.h eval_messages.cc: s-messages
 
-s-messages: expr_messages.mes
-	$(top_builddir)/src/lib/log/compiler/message $(top_srcdir)/src/lib/expr/expr_messages.mes
+s-messages: eval_messages.mes
+	$(top_builddir)/src/lib/log/compiler/message $(top_srcdir)/src/lib/eval/eval_messages.mes
+
+# Tell Automake that the eval_messages.{cc,h} source files are created in the
+# build process, so it must create these before doing anything else. Although
+# they are a dependency of the library (so will be created from the
+# message file anyway), there is no guarantee as to exactly _when_ in the build
+# they will be created.  As the .h file is included in other sources file (so
+# must be present when they are compiled), the safest option is to create it
+# first.
+BUILT_SOURCES = eval_messages.h eval_messages.cc
 
 CLEANFILES = expr_messages.h expr_messages.cc
diff --git a/src/lib/eval/eval_messages.mes b/src/lib/eval/eval_messages.mes
new file mode 100644
index 0000000000..0ed3fa0e20
--- /dev/null
+++ b/src/lib/eval/eval_messages.mes
@@ -0,0 +1,20 @@
+# Copyright (C) 2012-2015  Internet Systems Consortium, Inc. ("ISC")
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
+$NAMESPACE isc::dhcp
+
+% EVAL_RESULT Expression %1 evaluated to %2
+This debug message indicates that the expression has been evaluated
+to said value. This message is mostly useful during debugging of the
+client classification expressions.