diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-10-28 15:54:03 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-10-28 15:54:03 +0000 |
| commit | 0b8a18cfb2ad1a63683945d08d0be48220156a36 (patch) | |
| tree | 5bc7ed57e63c8250bda2b39419c615b0f9d9623a | |
| parent | bb19594cabc7bc4d6dcafc3afeaddf5ecddc3f76 (diff) | |
| parent | a2f5c52f61a53e3754f011d490febada626461bd (diff) | |
| download | rabbitmq-server-git-0b8a18cfb2ad1a63683945d08d0be48220156a36.tar.gz | |
merging in from default
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 3 | ||||
| -rwxr-xr-x | scripts/rabbitmq-server.bat | 4 | ||||
| -rw-r--r-- | src/rabbit_guid.erl | 8 | ||||
| -rw-r--r-- | src/rabbit_misc.erl | 2 |
4 files changed, 5 insertions, 12 deletions
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index 3a5cc2b068..62fb1dfbc5 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -75,9 +75,8 @@ echo '%defattr(-,root,root, -)' >> %{_builddir}/filelist.%{name}.rpm %pre if [ $1 -gt 1 ]; then - #Upgrade - stop and remove previous instance of rabbitmq-server init.d script + # Upgrade - stop previous instance of rabbitmq-server init.d script /sbin/service rabbitmq-server stop - /sbin/chkconfig --del rabbitmq-server fi # create rabbitmq group diff --git a/scripts/rabbitmq-server.bat b/scripts/rabbitmq-server.bat index bf77e4e4f4..4fcdb4e2b1 100755 --- a/scripts/rabbitmq-server.bat +++ b/scripts/rabbitmq-server.bat @@ -77,13 +77,13 @@ set LOGS="%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%.log" set SASL_LOGS="%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%-sasl.log"
set LOGS_BACKUP="%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%.log%BACKUP_EXTENSION%"
-set SASL_LOGS_BAKCUP="%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%-sasl.log%BACKUP_EXTENSION%"
+set SASL_LOGS_BACKUP="%RABBITMQ_BASE%\log\%RABBITMQ_NODENAME%-sasl.log%BACKUP_EXTENSION%"
if exist %LOGS% (
type %LOGS% >> %LOGS_BACKUP%
)
if exist %SASL_LOGS% (
- type %SASL_LOGS% >> %SASL_LOGS_BAKCUP%
+ type %SASL_LOGS% >> %SASL_LOGS_BACKUP%
)
rem End of log management
diff --git a/src/rabbit_guid.erl b/src/rabbit_guid.erl index 5053d18831..dee21c3421 100644 --- a/src/rabbit_guid.erl +++ b/src/rabbit_guid.erl @@ -104,13 +104,7 @@ guid() -> %% generate a readable string representation of a guid. Note that any %% monotonicity of the guid is not preserved in the encoding. string_guid(Prefix) -> - %% we use the (undocumented) ssl_base64 module here because it is - %% present throughout OTP R11 and R12 whereas base64 only becomes - %% available in R11B-4. - %% - %% TODO: once debian stable and EPEL have moved from R11B-2 to - %% R11B-4 or later we should change this to use base64. - Prefix ++ "-" ++ ssl_base64:encode(guid()). + Prefix ++ "-" ++ base64:encode_to_string(guid()). binstring_guid(Prefix) -> list_to_binary(string_guid(Prefix)). diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index d84c570b57..21764fce6d 100644 --- a/src/rabbit_misc.erl +++ b/src/rabbit_misc.erl @@ -323,7 +323,7 @@ nodeparts(NodeStr) -> end. cookie_hash() -> - ssl_base64:encode(erlang:md5(atom_to_list(erlang:get_cookie()))). + base64:encode_to_string(erlang:md5(atom_to_list(erlang:get_cookie()))). tcp_name(Prefix, IPAddress, Port) when is_atom(Prefix) andalso is_number(Port) -> |