Skip to content

ENT-14275: Move cf-reactor to core #6263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
victormlg wants to merge 1 commit into
base: master
Choose a base branch
from
+215 −0
Open

ENT-14275: Move cf-reactor to core #6263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ stamp-h1
/cf-testd/Makefile
/cf-upgrade/Makefile
/cf-watchd/Makefile
/cf-reactor/Makefile
/contrib/vagrant-ci/centos-9s-x64/Makefile
/examples/Makefile
/ext/Makefile
Expand Down Expand Up @@ -115,6 +116,8 @@ xml_tmp_suite
/cf-upgrade/cf-upgrade.exe
/cf-watchd/cf-watchd
/cf-watchd/cf-watchd.exe
/cf-reactor/cf-reactor
/cf-reactor/cf-reactor.exe
/ext/rpmvercmp
/ext/rpmvercmp.exe

Expand Down
1 change: 1 addition & 0 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ SUBDIRS = \
cf-net \
cf-secret \
cf-watchd \
cf-reactor \
misc \
python \
ext \
Expand Down
54 changes: 54 additions & 0 deletions cf-reactor/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
#
# Copyright 2026 Northern.tech AS
#
# This file is part of CFEngine 3 - written and maintained by Northern.tech AS.
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
# Free Software Foundation; version 3.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
#
# To the extent this program is licensed as part of the Enterprise
# versions of CFEngine, the applicable Commercial Open Source License
# (COSL) may apply to this file if you as a licensee so wish it. See
# included file COSL.txt.
#
noinst_LTLIBRARIES = libcf-reactor.la

AM_CPPFLAGS = -I$(srcdir)/../libpromises -I$(srcdir)/../libntech/libutils \
-I$(srcdir)/../libcfecompat \
-I$(srcdir)/../libcfnet \
$(OPENSSL_CPPFLAGS) \
$(PCRE2_CPPFLAGS) \
Comment on lines +28 to +30

@larsewi larsewi Aug 18, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you really need any of these flags in the community version?

@victormlg victormlg Aug 18, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so, when I built ubuntu-24 agent community without the flags, I got:

Making all in cf-secret
  CC       cf-secret.lo
  CCLD     libcf-secret.la
  CCLD     cf-secret
Making all in cf-watchd
  CC       cf-watchd.lo
  CCLD     libcf-watchd.la
  CCLD     cf-watchd
Making all in cf-reactor
  CC       cf-reactor.lo
In file included from ./../libcfnet/cfnet.h:81,
                 from ./../libpromises/cf3.defs.h:39,
                 from ./../libpromises/generic_agent.h:28,
                 from cf-reactor.c:32:
./../libcfnet/connection_info.h:31:10: fatal error: openssl/ssl.h: No such file or directory
   31 | #include <openssl/ssl.h>
      |          ^~~~~~~~~~~~~~~
compilation terminated.
gmake[2]: *** [Makefile:613: cf-reactor.lo] Error 1
gmake[2]: Target 'all' not remade because of errors.
Making all in misc
Making all in selinux
Making all in python
Making all in ext
  CC       rpmvercmp.o
  CCLD     rpmvercmp
Making all in examples
Making all in tests
Making all in unit
  CC       redirection_test_stub.o
  CC       cmockery.lo
  CC       test.lo
  CCLD     libtest.la
  CCLD     redirection_test_stub
Making all in load
Making all in acceptance
Making all in 25_cf-execd
  CC       cf-execd-rpl-functions.o
  CCLD     cf-execd-test
  CC       mock_package_manager.lo
  CC       no_fds.o
  CC       custom_promise_binary.o
  CC       xml_c14nize-xml-c14nize.o
  CCLD     custom_promise_binary
  CCLD     no_fds
  CCLD     xml-c14nize
  CCLD     libmock_package_manager.la
  CCLD     mock_package_manager
Making all in static-check
Making all in valgrind-check
Making all in contrib/vagrant-ci/centos-9s-x64
gmake[1]: *** [Makefile:765: all-recursive] Error 1
gmake: *** [Makefile:650: all] Error 2
gmake: Leaving directory '/home/builder/build/core'
--- End of Output (Error Code: 2) ---

=== FAILED: 05-compile (exit code 2) ===
Build failed (exit code 2).

$(ENTERPRISE_CPPFLAGS)

AM_CFLAGS = $(CF3_CFLAGS) \
$(DEBUG_CFLAGS) \
$(OPENSSL_CFLAGS) \

@larsewi larsewi Aug 18, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here

$(ENTERPRISE_CFLAGS)

libcf_reactor_la_LIBADD = ../libpromises/libpromises.la

libcf_reactor_la_SOURCES = \
cf-reactor.c

if !BUILTIN_EXTENSIONS
bin_PROGRAMS = cf-reactor
cf_reactor_LDADD = libcf-reactor.la
cf_reactor_SOURCES =
endif

CLEANFILES = *.gcno *.gcda

#
# Some basic clean ups
#
MOSTLYCLEANFILES = *~ *.orig *.rej
147 changes: 147 additions & 0 deletions cf-reactor/cf-reactor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,147 @@
/*
Copyright 2026 Northern.tech AS

This file is part of CFEngine 3 - written and maintained by Northern.tech AS.

This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation; version 3.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA

To the extent this program is licensed as part of the Enterprise
versions of CFEngine, the applicable Commercial Open Source License
(COSL) may apply to this file if you as a licensee so wish it. See
included file COSL.txt.
*/


#include <platform.h>
#include <logging.h>
#include <stdio.h>
#include <stdlib.h>
#include <writer.h>
#include <config.h>
#include <generic_agent.h>
#include <man.h>
#include <cleanup.h>
#include <prototypes3.h>

static const Component COMPONENT =
{
.name = "cf-reactor",
.website = CF_WEBSITE,
.copyright = CF_COPYRIGHT
};

static const char *const CF_REACTOR_SHORT_DESCRIPTION = "CFEngine event reaction daemon";

static const char *const CF_REACTOR_MANPAGE_LONG_DESCRIPTION =
"cf-reactor is a daemon reacting on events, currently only NOTIFY events from PostgreSQL.";

static const struct option OPTIONS[] =
{
{"debug", no_argument, 0, 'd'},
{"no-fork", no_argument, 0, 'F'},
{"log-level", required_argument, 0, 'g'},
{"help", no_argument, 0, 'h'},
{"inform", no_argument, 0, 'I'},
{"timestamp", no_argument, 0, 'l'},
{"verbose", no_argument, 0, 'v'},
{"version", no_argument, 0, 'V'},
{NULL, 0, 0, '\0'}
};

static const char *const HINTS[] =
{
"Enable debugging output and run in foreground",
"Run as a foreground process (do not fork)",
"Specify how detailed logs should be. Possible values: 'error', 'warning', 'notice', 'info', 'verbose', 'debug'",
"Print the help message",
"Print basic information about actions being taken",
"Log timestamps on each line of log output",
"Output verbose information about the behaviour of the agent",
"Output the version of the software",
NULL
};

int main(int argc, char *argv[])
{
bool no_fork = false;

extern char *optarg;
int longopt_idx;
int c;
while ((c = getopt_long(argc, argv, "dFg:hIlMvV",
OPTIONS, &longopt_idx))
!= -1)
{
switch (c)
{
case 'd':
LogSetGlobalLevel(LOG_LEVEL_DEBUG);
no_fork = true;
break;

case 'F':
no_fork = true;
break;

case 'g':
LogSetGlobalLevelArgOrExit(optarg);
break;

case 'h':
{
Writer *w = FileWriter(stdout);
WriterWriteHelp(w, &COMPONENT, OPTIONS, HINTS, NULL, false, true);
FileWriterDetach(w);
}
DoCleanupAndExit(EXIT_SUCCESS);

case 'I':
LogSetGlobalLevel(LOG_LEVEL_INFO);
break;

case 'l':
LoggingEnableTimestamps(true);
break;

case 'M':
{
Writer *out = FileWriter(stdout);
ManPageWrite(out, "cf-reactor", time(NULL),
CF_REACTOR_SHORT_DESCRIPTION,
CF_REACTOR_MANPAGE_LONG_DESCRIPTION,
OPTIONS, HINTS,
NULL, false,
true);
FileWriterDetach(out);
DoCleanupAndExit(EXIT_SUCCESS);
}

case 'v':
LogSetGlobalLevel(LOG_LEVEL_VERBOSE);
no_fork = true;
break;

case 'V':
{
Writer *w = FileWriter(stdout);
GenericAgentWriteVersion(w);
FileWriterDetach(w);
}
DoCleanupAndExit(EXIT_SUCCESS);

}
}

return ReactorEnterpriseMain(no_fork);
}
1 change: 1 addition & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2015,6 +2015,7 @@ AC_CONFIG_FILES([Makefile
cf-net/Makefile
cf-secret/Makefile
cf-watchd/Makefile
cf-reactor/Makefile
config.post.h
contrib/vagrant-ci/centos-9s-x64/Makefile
misc/Makefile
Expand Down
7 changes: 7 additions & 0 deletions libpromises/enterprise_stubs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,3 +231,10 @@ ENTERPRISE_VOID_FUNC_2ARG_DEFINE_STUB(void, Nova_ClassHistoryEnable,
ARG_UNUSED bool, enable)
{
}

ENTERPRISE_FUNC_1ARG_DEFINE_STUB(int, ReactorEnterpriseMain, ARG_UNUSED bool, no_fork)
{
Log(LOG_LEVEL_VERBOSE, "Nova extension library is not available.");
Log(LOG_LEVEL_VERBOSE, "Running open-source cf-reactor.");
Comment thread
victormlg marked this conversation as resolved.
return 0;
}
2 changes: 2 additions & 0 deletions libpromises/prototypes3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ ENTERPRISE_VOID_FUNC_0ARG_DECLARE(void, ReloadHAConfig);
ENTERPRISE_VOID_FUNC_2ARG_DECLARE(void, Nova_ClassHistoryAddContextName, const StringSet *, list, const char *, context_name);
ENTERPRISE_VOID_FUNC_2ARG_DECLARE(void, Nova_ClassHistoryEnable, StringSet **, list, bool, enable);

ENTERPRISE_FUNC_1ARG_DECLARE(int, ReactorEnterpriseMain, bool, no_fork);

/* manual.c */

void TexinfoManual(EvalContext *ctx, const char *source_dir, const char *output_file);
Expand Down
Loading