diff options
| author | Jan Lehnardt <jan@apache.org> | 2013-08-03 15:19:13 +0200 |
|---|---|---|
| committer | Jan Lehnardt <jan@apache.org> | 2013-08-03 15:19:13 +0200 |
| commit | 140245d10cb035f3d915509e3d14ead2d298b650 (patch) | |
| tree | fbce91f3223b09bd59a2709bd9f14439e16bf936 | |
| parent | 0d848df866fa8831ee5fd0bca8add0aa2ddeaf33 (diff) | |
| download | couchdb-140245d10cb035f3d915509e3d14ead2d298b650.tar.gz | |
move couch_version() to couch_server:couch_version(short)
| -rw-r--r-- | src/couch_plugins/src/couch_plugins.erl | 4 | ||||
| -rw-r--r-- | src/couchdb/couch_server.erl | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/couch_plugins/src/couch_plugins.erl b/src/couch_plugins/src/couch_plugins.erl index 507f11407..2b110bc5d 100644 --- a/src/couch_plugins/src/couch_plugins.erl +++ b/src/couch_plugins/src/couch_plugins.erl @@ -264,9 +264,7 @@ does_file_exist({error, enoent}) -> false; does_file_exist(_Else) -> true. couchdb_version() -> - %% strip git hash from version string - [Version|_Rest] = string:tokens(couch_server:get_version(), "+"), - Version. + couch_server:get_version(short). % installing a plugin: % - POST /_plugins -d {plugin-def} diff --git a/src/couchdb/couch_server.erl b/src/couchdb/couch_server.erl index 4aceb55bd..7cee0f5d6 100644 --- a/src/couchdb/couch_server.erl +++ b/src/couchdb/couch_server.erl @@ -13,7 +13,7 @@ -module(couch_server). -behaviour(gen_server). --export([open/2,create/2,delete/2,get_version/0,get_uuid/0]). +-export([open/2,create/2,delete/2,get_version/0,get_version/1,get_uuid/0]). -export([all_databases/0, all_databases/2]). -export([init/1, handle_call/3,sup_start_link/0]). -export([handle_cast/2,code_change/3,handle_info/2,terminate/2]). @@ -42,6 +42,11 @@ get_version() -> false -> "0.0.0" end. +get_version(short) -> + %% strip git hash from version string + [Version|_Rest] = string:tokens(get_version(), "+"), + Version. + get_uuid() -> case couch_config:get("couchdb", "uuid", nil) of |