[icinga-checkins] icinga.org: icinga2/master: Implement type keyword in the config compiler

git at icinga.org git at icinga.org
Sat Feb 2 14:28:30 CET 2013


Module: icinga2
Branch: master
Commit: 33aba14197045b7a0bea31ab09c1625e2f32fce4
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=33aba14197045b7a0bea31ab09c1625e2f32fce4

Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Sat Feb  2 14:28:11 2013 +0100

Implement type keyword in the config compiler

Fixes #3616

---

 icinga-app/icinga.cpp                              |   33 ++-
 itl/Makefile.am                                    |    9 +-
 itl/{itl-host.conf => host.conf}                   |    0
 itl/itl.conf                                       |    8 +-
 ...itl-service-common.conf => service-common.conf} |    0
 itl/{itl-service.conf => service.conf}             |    0
 itl/{itl-standalone.conf => standalone.conf}       |    0
 itl/{itl-service-common.conf => types.conf}        |  114 ++++--
 lib/base/dynamicobject.cpp                         |    5 +
 lib/base/dynamicobject.h                           |    2 +
 lib/config/Makefile.am                             |    8 +-
 lib/config/config.vcxproj                          |    8 +-
 lib/config/config_lexer.cc                         |  347 +++++++++------
 lib/config/config_lexer.ll                         |    9 +-
 lib/config/config_parser.cc                        |  452 +++++++++++++-------
 lib/config/config_parser.h                         |   41 ++-
 lib/config/config_parser.yy                        |  112 +++++-
 lib/config/configcompiler.cpp                      |   94 +++--
 lib/config/configcompiler.h                        |   29 +-
 lib/config/configtype.cpp                          |  119 +++++
 .../config/configtype.h                            |  134 +++---
 lib/config/i2-config.h                             |    3 +
 itl/itl-service.conf => lib/config/typerule.cpp    |   95 +++--
 itl/itl-service.conf => lib/config/typerule.h      |   96 +++--
 .../config/typerulelist.cpp                        |  137 ++++---
 itl/itl-service.conf => lib/config/typerulelist.h  |   84 +++--
 26 files changed, 1322 insertions(+), 617 deletions(-)

Diff:   https://git.icinga.org/?p=icinga2.git;a=commitdiff;h=33aba14197045b7a0bea31ab09c1625e2f32fce4




More information about the icinga-checkins mailing list