From 46130027d8e6e91951226456174e6ad471ddc50f Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Sat, 20 Feb 2016 22:33:00 +0200 Subject: Improve control interface This commit implements the following operations on the new /conf endpoints: GET /conf/runtime - List configuration PUT /conf/runtime - Reload configuration POST /conf/runtime - Post new configuration GET /conf/files - List configuration files DELETE /conf/files - Delete some or all configuration files from the list POST /conf/files - Install new configuration file Piesctl supports the following new commands: piesctl config reload piesctl config file clear piesctl config file add SYNTAX NAME piesctl config file del[ete] NAME [NAME...] piesctl config file list * src/ctl.c (res_conf): New function. (restab): New endpoint /conf * src/pies.c (config_file_add): Set free_entry. (config_file_remove, config_file_remove_all) (config_file_list_serialize): New functions. (pies_config_parse): Bail out if tree processing fails. (pies_reload): Remove unused function. (main): Redo ACTION_RELOAD handling. Handle ACTION_COMMIT. * src/pies.h (ACTION_COMMIT): New action. (config_file_remove, config_file_remove_all) (config_file_list_serialize) (pies_read_config, progman_gc): New protos. * src/piesctl.c (cmdline_parser_state): New struct (next_token, peek_token): Take ptr to cmdline_parser_state as argument. (parse_error, require_token, assert_eol) (piesctl_format): New functions. (parse_condition_to_uri): Rewrite using piesctl_format. New subcommand: config. Improve help output. --- src/pies.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/pies.h') diff --git a/src/pies.h b/src/pies.h index b61e11b..5154317 100644 --- a/src/pies.h +++ b/src/pies.h @@ -271,7 +271,8 @@ enum pies_action { ACTION_RELOAD, ACTION_CTRLALTDEL, ACTION_KBREQUEST, - ACTION_POWER + ACTION_POWER, + ACTION_COMMIT }; extern char *instance; @@ -309,6 +310,10 @@ struct config_syntax; struct config_syntax *str_to_config_syntax (const char *str); void config_file_add (struct config_syntax *syntax, const char *name); void config_file_add_type (enum config_syntax_type syntax, const char *name); +void config_file_list_serialize (struct json_value *ar); + +int config_file_remove (const char *name); +void config_file_remove_all (void); void free_redirector (struct redirector *rp); @@ -322,9 +327,12 @@ void free_action (struct action *act); void pies_schedule_children (int op); +int pies_read_config (void); + void register_prog (struct component *comp); int progman_waiting_p (void); void progman_start (void); +void progman_gc (void); void progman_wake_sleeping (int); void progman_stop (void); void progman_cleanup (int expect_term); -- cgit v1.2.1