Skip to content

Commit

Permalink
MB-10227: Avoid crash on allowedTimePeriod in compaction settings.
Browse files Browse the repository at this point in the history
Change-Id: Ie6ca73585da93c8ae35efbbaea446a8fd2e8b0b3
Reviewed-on: http://review.couchbase.org/33647
Tested-by: Aliaksey Artamonau <aliaksiej.artamonau@gmail.com>
Reviewed-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Reviewed-on: http://review.couchbase.org/34025
Tested-by: Philip Labee <philip@couchbase.com>
Reviewed-by: Philip Labee <philip@couchbase.com>
  • Loading branch information
Phil Labee committed Feb 28, 2014
1 parent 8cdeca0 commit 2917f36
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/menelaus_web.erl
Expand Up @@ -1153,12 +1153,12 @@ build_auto_compaction_settings(Settings) ->
end] ++ DBAndView}.

build_auto_compaction_allowed_time_period(AllowedTimePeriod) ->
[{JSONName, proplists:get_value(CfgName, AllowedTimePeriod)}
|| {JSONName, CfgName} <- [{fromHour, from_hour},
{toHour, to_hour},
{fromMinute, from_minute},
{toMinute, to_minute},
{abortOutside, abort_outside}]].
{struct, [{JSONName, proplists:get_value(CfgName, AllowedTimePeriod)}
|| {JSONName, CfgName} <- [{fromHour, from_hour},
{toHour, to_hour},
{fromMinute, from_minute},
{toMinute, to_minute},
{abortOutside, abort_outside}]]}.

build_fast_warmup_settings(Settings) ->
Mappings = [{fast_warmup_enabled, fastWarmupEnabled},
Expand Down

0 comments on commit 2917f36

Please sign in to comment.