gnunet-svn
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-anastasis] branch master updated: Worked on errors with running a

From: gnunet
Subject: [taler-anastasis] branch master updated: Worked on errors with running anastasis-httpd
Date: Tue, 12 Nov 2019 11:08:45 +0100 
This is an automated email from the git hooks/post-receive script.

dennis-neufeld pushed a commit to branch master
in repository anastasis.

The following commit(s) were added to refs/heads/master by this push:
     new db375f9  Worked on errors with running anastasis-httpd
db375f9 is described below

commit db375f95e35ab3d42dc6359d58a071e7d6c75a0f
Author: Dennis Neufeld <address@hidden>
AuthorDate: Tue Nov 12 10:08:24 2019 +0000

    Worked on errors with running anastasis-httpd
---
 src/backend/Makefile.am               | 11 +++++++----
 src/backend/anastasis-httpd.c         | 15 +++++++--------
 src/backend/anastasis.conf            |  3 ++-
 src/include/anastasis.h               |  2 +-
 src/include/anastasis_database_lib.h  |  4 ++--
 src/stasis/anastasis_db_postgres.conf |  7 ++++++-
 6 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am
index 04791a4..3a74b6e 100644
--- a/src/backend/Makefile.am
+++ b/src/backend/Makefile.am
@@ -1,14 +1,13 @@
 # This Makefile.am is in the public domain
-AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_srcdir)/src/backend-lib/
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+
 
 pkgcfgdir = $(prefix)/share/anastasis/config.d/
 
 pkgcfg_DATA = \
   anastasis.conf
 
-EXTRA_DIST = \
-  $(pkgcfg_DATA)
-
 bin_PROGRAMS = \
   anastasis-httpd
 
@@ -19,9 +18,13 @@ anastasis_httpd_SOURCES = \
   anastasis-httpd_mhd.c anastasis-httpd_mhd.h
 
 anastasis_httpd_LDADD = \
+  $(top_builddir)/src/util/libanastasisutil.la \
   $(top_builddir)/src/stasis/libanastasisdb.la \
   -lmicrohttpd \
   -ljansson \
   -lgnunetcurl \
   -lgnunetjson \
   -lgnunetutil
+
+EXTRA_DIST = \
+  $(pkgcfg_DATA)
\ No newline at end of file
diff --git a/src/backend/anastasis-httpd.c b/src/backend/anastasis-httpd.c
index 42db89c..97d8c0f 100644
--- a/src/backend/anastasis-httpd.c
+++ b/src/backend/anastasis-httpd.c
@@ -153,7 +153,7 @@ url_handler (void *cls,
   };
   static struct TMH_RequestHandler h404 = {
     "", NULL, "text/html",
-    "<html><title>404: not found</title></html>", 0,
+    "<html><title>404: not found blub</title></html>", 0,
     &TMH_MHD_handler_static_response, MHD_HTTP_NOT_FOUND
   };
 
@@ -432,14 +432,13 @@ run (void *cls,
                  GNUNET_log_setup ("anastasis-httpd",
                                    "WARNING",
                                    NULL));
-/*  if (NULL ==
+
+  if (NULL ==
      (db = ANASTASIS_DB_plugin_load (config)))
   {
-     GNUNET_SCHEDULER_shutdown ();
-     return;
+    GNUNET_SCHEDULER_shutdown ();
+    return;
   }
-*/
-
 
   {
     const char *choices[] = {"tcp",
@@ -451,13 +450,13 @@ run (void *cls,
     if (GNUNET_OK !=
         GNUNET_CONFIGURATION_get_value_choice (config,
                                                "anastasis",
-                                               "SERVE",
+                                               "serve",
                                                choices,
                                                &serve_type))
     {
       GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
                                  "anastasis",
-                                 "SERVE",
+                                 "serve",
                                  "serve type required");
       GNUNET_SCHEDULER_shutdown ();
       return;
diff --git a/src/backend/anastasis.conf b/src/backend/anastasis.conf
index 43ce9d0..11f9d4f 100644
--- a/src/backend/anastasis.conf
+++ b/src/backend/anastasis.conf
@@ -5,6 +5,7 @@
 
 # General settings for the backend.
 [anastasis]
+
 # Use TCP or UNIX domain sockets?
 SERVE = tcp
 
@@ -26,5 +27,5 @@ UNIXPATH_MODE = 660
 DB = postgres
 
 # Configuration for postgres database.
-[anastasis-postgres]
+[anastasisdb-postgres]
 CONFIG = postgres:///anastasis
diff --git a/src/include/anastasis.h b/src/include/anastasis.h
index 2c18b6b..8f935f4 100644
--- a/src/include/anastasis.h
+++ b/src/include/anastasis.h
@@ -25,4 +25,4 @@
 
 #include "anastasis_service.h"
 
-//FIXME
\ No newline at end of file
+// FIXME
\ No newline at end of file
diff --git a/src/include/anastasis_database_lib.h 
b/src/include/anastasis_database_lib.h
index 26f605d..39a4b54 100644
--- a/src/include/anastasis_database_lib.h
+++ b/src/include/anastasis_database_lib.h
@@ -29,7 +29,7 @@
  * @return NULL on failure
  */
 struct ANASTASIS_DatabasePlugin *
-ANASTASIS_DB_plugin_load (void *cls);
+ANASTASIS_DB_plugin_load (const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
@@ -38,7 +38,7 @@ ANASTASIS_DB_plugin_load (void *cls);
  * @param plugin plugin to unload
  */
 void
-ANASTASIS_DB_plugin_unload (void *cls);
+ANASTASIS_DB_plugin_unload (struct ANASTASIS_DatabasePlugin *plugin);
 
 /**
  * Status code returned from functions running database commands.
diff --git a/src/stasis/anastasis_db_postgres.conf 
b/src/stasis/anastasis_db_postgres.conf
index 504dfdc..0460bd2 100644
--- a/src/stasis/anastasis_db_postgres.conf
+++ b/src/stasis/anastasis_db_postgres.conf
@@ -1,2 +1,7 @@
+[anastasis]
+#The DB plugin to use
+DB = postgres
+
 [anastasisdb-postgres]
-CONFIG = "postgres:///anastasis"
+#The connection string the plugin has to use for connecting to the database
+CONFIG = postgres:///anastasis

-- 
To stop receiving notification emails like this one, please contact
address@hidden.
reply via email to
[Prev in Thread] Current Thread [Next in Thread]