From ce6c5f7d6ccd5944ebe7cc19a41db28e23232aed Mon Sep 17 00:00:00 2001 From: Hiroshi Hatake Date: Tue, 23 May 2017 16:49:37 +0900 Subject: [PATCH] Make mantadory parameters config_params that do not set default value become mandatory parameters. --- lib/fluent/plugin/in_gcloud_pubsub.rb | 7 ++----- lib/fluent/plugin/out_gcloud_pubsub.rb | 4 +--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/fluent/plugin/in_gcloud_pubsub.rb b/lib/fluent/plugin/in_gcloud_pubsub.rb index 80a4d8c..a97abc0 100644 --- a/lib/fluent/plugin/in_gcloud_pubsub.rb +++ b/lib/fluent/plugin/in_gcloud_pubsub.rb @@ -8,8 +8,8 @@ class GcloudPubSubInput < Input config_param :tag, :string config_param :project, :string, :default => nil - config_param :topic, :string, :default => nil - config_param :subscription, :string, :default => nil + config_param :topic, :string + config_param :subscription, :string config_param :key, :string, :default => nil config_param :pull_interval, :integer, :default => 5 config_param :max_messages, :integer, :default => 100 @@ -26,9 +26,6 @@ class GcloudPubSubInput < Input def configure(conf) super - raise Fluent::ConfigError, "'topic' must be specified." unless @topic - raise Fluent::ConfigError, "'subscription' must be specified." unless @subscription - configure_parser(conf) end diff --git a/lib/fluent/plugin/out_gcloud_pubsub.rb b/lib/fluent/plugin/out_gcloud_pubsub.rb index d80d0bf..3290a9b 100644 --- a/lib/fluent/plugin/out_gcloud_pubsub.rb +++ b/lib/fluent/plugin/out_gcloud_pubsub.rb @@ -13,7 +13,7 @@ class GcloudPubSubOutput < BufferedOutput config_set_default :buffer_queue_limit, 64 config_param :project, :string, :default => nil - config_param :topic, :string, :default => nil + config_param :topic, :string config_param :key, :string, :default => nil config_param :autocreate_topic, :bool, :default => false @@ -27,8 +27,6 @@ class GcloudPubSubOutput < BufferedOutput def configure(conf) super - - raise Fluent::ConfigError, "'topic' must be specified." unless @topic end def start