From 21f47438614a0d50caf20801c4440d54d12c3f20 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Sat, 30 Aug 2014 22:14:48 -0500 Subject: remove more code that can be brought back later if needed --- test/upgrade_project/README.md | 40 --- test/upgrade_project/apps/dummy/src/dummy.app.src | 9 - test/upgrade_project/apps/dummy/src/dummy_app.erl | 9 - .../apps/dummy/src/dummy_server.erl | 56 ---- test/upgrade_project/apps/dummy/src/dummy_sup.erl | 15 - test/upgrade_project/rebar.config | 4 - test/upgrade_project/rel/files/dummy | 347 --------------------- test/upgrade_project/rel/files/erl | 44 --- test/upgrade_project/rel/files/nodetool | 182 ----------- test/upgrade_project/rel/files/sys.config | 11 - test/upgrade_project/rel/files/vm.args | 19 -- test/upgrade_project/rel/reltool.config | 27 -- 12 files changed, 763 deletions(-) delete mode 100644 test/upgrade_project/README.md delete mode 100644 test/upgrade_project/apps/dummy/src/dummy.app.src delete mode 100644 test/upgrade_project/apps/dummy/src/dummy_app.erl delete mode 100644 test/upgrade_project/apps/dummy/src/dummy_server.erl delete mode 100644 test/upgrade_project/apps/dummy/src/dummy_sup.erl delete mode 100644 test/upgrade_project/rebar.config delete mode 100755 test/upgrade_project/rel/files/dummy delete mode 100755 test/upgrade_project/rel/files/erl delete mode 100644 test/upgrade_project/rel/files/nodetool delete mode 100644 test/upgrade_project/rel/files/sys.config delete mode 100644 test/upgrade_project/rel/files/vm.args delete mode 100644 test/upgrade_project/rel/reltool.config (limited to 'test/upgrade_project') diff --git a/test/upgrade_project/README.md b/test/upgrade_project/README.md deleted file mode 100644 index 8df5383..0000000 --- a/test/upgrade_project/README.md +++ /dev/null @@ -1,40 +0,0 @@ -#### Building version 0.1 - rebar compile - rebar generate - mv rel/dummy rel/dummy_0.1 - rebar clean - # start the release: - cd rel/dummy_0.1 - bin/dummy console - - erl> dummy_server:get_state(). - erl> dummy_server:set_state(123). - erl> dummy_server:get_state(). - -#### Building version 0.2 - - # Now, in another terminal we prepare an upgrade.. - - # change release version numbers from 0.1 to 0.2 in - $EDITOR apps/dummy/src/dummy.app.src - $EDITOR rel/reltool.config - - rebar compile - rebar generate - # previous_release path is relative to your rel directory - rebar generate-appups previous_release=dummy_0.1 - rebar generate-upgrade previous_release=dummy_0.1 - tar -zvtf rel/dummy_0.2.tar.gz - - -#### Deploying with release_handler - mv rel/dummy_0.2.tar.gz rel/dummy_0.1/releases/ - - # Now use release_handler in the running erlang console for the deploy: - - erl> release_handler:unpack_release("dummy_0.2"). - erl> release_handler:install_release("0.2"). - erl> release_handler:make_permanent("0.2"). - - erl> release_handler:which_releases(). - erl> dummy_server:get_state(). diff --git a/test/upgrade_project/apps/dummy/src/dummy.app.src b/test/upgrade_project/apps/dummy/src/dummy.app.src deleted file mode 100644 index dd06752..0000000 --- a/test/upgrade_project/apps/dummy/src/dummy.app.src +++ /dev/null @@ -1,9 +0,0 @@ -{application, dummy, [ - {description, "a dummy app"}, - {vsn, "0.1"}, - {registered, [ - dummy_app - ]}, - {mod, {dummy_app, []}}, - {applications, [kernel, stdlib, sasl]} -]}. diff --git a/test/upgrade_project/apps/dummy/src/dummy_app.erl b/test/upgrade_project/apps/dummy/src/dummy_app.erl deleted file mode 100644 index 51363b3..0000000 --- a/test/upgrade_project/apps/dummy/src/dummy_app.erl +++ /dev/null @@ -1,9 +0,0 @@ --module(dummy_app). --behaviour(application). - --export([start/2, stop/1]). - -start(_,_) -> - dummy_sup:start_link(). - -stop(_) -> ok. diff --git a/test/upgrade_project/apps/dummy/src/dummy_server.erl b/test/upgrade_project/apps/dummy/src/dummy_server.erl deleted file mode 100644 index 382251e..0000000 --- a/test/upgrade_project/apps/dummy/src/dummy_server.erl +++ /dev/null @@ -1,56 +0,0 @@ --module(dummy_server). --behaviour(gen_server). - --export([start_link/0, set_state/1, get_state/0]). - --export([init/1, - handle_call/3, - handle_cast/2, - handle_info/2, - terminate/2, - code_change/3]). - -%% - -start_link() -> - gen_server:start_link({local, ?MODULE}, ?MODULE, [], []). - -set_state(What) -> - gen_server:call(?MODULE, {set_state, What}). - -get_state() -> - gen_server:call(?MODULE, get_state). - - -%% - -init([]) -> - say("init, setting state to 0", []), - {ok, 0}. - - -handle_call({set_state, NewState}, _From, _State) -> - {reply, {ok, NewState}, NewState}; - -handle_call(get_state, _From, State) -> - {reply, State, State}. - -handle_cast('__not_implemented', State) -> - {noreply, State}. - -handle_info(_Info, State) -> - say("info ~p, ~p.", [_Info, State]), - {noreply, State}. - -terminate(_Reason, _State) -> - say("terminate ~p, ~p", [_Reason, _State]), - ok. - -code_change(_OldVsn, State, _Extra) -> - say("code_change ~p, ~p, ~p", [_OldVsn, State, _Extra]), - {ok, State}. - -%% Internal - -say(Format, Data) -> - io:format("~p:~p: ~s~n", [?MODULE, self(), io_lib:format(Format, Data)]). diff --git a/test/upgrade_project/apps/dummy/src/dummy_sup.erl b/test/upgrade_project/apps/dummy/src/dummy_sup.erl deleted file mode 100644 index b5617c7..0000000 --- a/test/upgrade_project/apps/dummy/src/dummy_sup.erl +++ /dev/null @@ -1,15 +0,0 @@ --module(dummy_sup). --behaviour(supervisor). - --export([start_link/0]). --export([init/1]). - -start_link() -> - supervisor:start_link({local, ?MODULE}, ?MODULE, []). - -init([]) -> - Dummy = {dummy_server, - {dummy_server, start_link, []}, - permanent, 5000, worker, [dummy_server]}, - - {ok, {{one_for_one, 10, 10}, [Dummy]}}. diff --git a/test/upgrade_project/rebar.config b/test/upgrade_project/rebar.config deleted file mode 100644 index 11b5b9a..0000000 --- a/test/upgrade_project/rebar.config +++ /dev/null @@ -1,4 +0,0 @@ -{sub_dirs, [ - "apps/dummy", - "rel" -]}. diff --git a/test/upgrade_project/rel/files/dummy b/test/upgrade_project/rel/files/dummy deleted file mode 100755 index c2ef258..0000000 --- a/test/upgrade_project/rel/files/dummy +++ /dev/null @@ -1,347 +0,0 @@ -#!/bin/sh -# -*- tab-width:4;indent-tabs-mode:nil -*- -# ex: ts=4 sw=4 et - -# /bin/sh on Solaris is not a POSIX compatible shell, but /usr/bin/ksh is. -if [ `uname -s` = 'SunOS' -a "${POSIX_SHELL}" != "true" ]; then - POSIX_SHELL="true" - export POSIX_SHELL - # To support 'whoami' add /usr/ucb to path - PATH=/usr/ucb:$PATH - export PATH - exec /usr/bin/ksh $0 "$@" -fi - -# clear it so if we invoke other scripts, they run as ksh -unset POSIX_SHELL - -RUNNER_SCRIPT_DIR=$(cd ${0%/*} && pwd -P) - -CALLER_DIR=$PWD - -RUNNER_BASE_DIR=${RUNNER_SCRIPT_DIR%/*} -RUNNER_ETC_DIR=$RUNNER_BASE_DIR/etc -# Note the trailing slash on $PIPE_DIR/ -PIPE_DIR=/tmp/$RUNNER_BASE_DIR/ -RUNNER_USER= -WHOAMI=$(whoami) - -# Make sure this script is running as the appropriate user -if ([ "$RUNNER_USER" ] && [ "x$WHOAMI" != "x$RUNNER_USER" ]); then - type sudo > /dev/null 2>&1 - if [ $? -ne 0 ]; then - echo "sudo doesn't appear to be installed and your EUID isn't $RUNNER_USER" 1>&2 - exit 1 - fi - echo "Attempting to restart script through sudo -H -u $RUNNER_USER" >&2 - exec sudo -H -u $RUNNER_USER -i $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@ -fi - -# Identify the script name -SCRIPT=`basename $0` - -# Parse out release and erts info -START_ERL=`cat $RUNNER_BASE_DIR/releases/start_erl.data` -ERTS_VSN=${START_ERL% *} -APP_VSN=${START_ERL#* } - -# Use $CWD/vm.args if exists, otherwise releases/APP_VSN/vm.args, or -# else etc/vm.args -if [ -e "$CALLER_DIR/vm.args" ]; then - VMARGS_PATH=$CALLER_DIR/vm.args - USE_DIR=$CALLER_DIR -else - USE_DIR=$RUNNER_BASE_DIR - if [ -e "$RUNNER_BASE_DIR/releases/$APP_VSN/vm.args" ]; then - VMARGS_PATH="$RUNNER_BASE_DIR/releases/$APP_VSN/vm.args" - else - VMARGS_PATH="$RUNNER_ETC_DIR/vm.args" - fi -fi - -RUNNER_LOG_DIR=$USE_DIR/log -# Make sure log directory exists -mkdir -p $RUNNER_LOG_DIR - -# Use releases/VSN/sys.config if it exists otherwise use etc/app.config -if [ -e "$USE_DIR/sys.config" ]; then - CONFIG_PATH="$USE_DIR/sys.config" -else - if [ -e "$RUNNER_BASE_DIR/releases/$APP_VSN/sys.config" ]; then - CONFIG_PATH="$RUNNER_BASE_DIR/releases/$APP_VSN/sys.config" - else - CONFIG_PATH="$RUNNER_ETC_DIR/app.config" - fi -fi - -# Extract the target node name from node.args -NAME_ARG=`egrep '^\-s?name' $VMARGS_PATH` -if [ -z "$NAME_ARG" ]; then - echo "vm.args needs to have either -name or -sname parameter." - exit 1 -fi - -# Extract the name type and name from the NAME_ARG for REMSH -REMSH_TYPE=`echo $NAME_ARG | awk '{print $1}'` -REMSH_NAME=`echo $NAME_ARG | awk '{print $2}'` - -# Note the `date +%s`, used to allow multiple remsh to the same node -# transparently -REMSH_NAME_ARG="$REMSH_TYPE remsh`date +%s`@`echo $REMSH_NAME | awk -F@ '{print $2}'`" -REMSH_REMSH_ARG="-remsh $REMSH_NAME" - -# Extract the target cookie -COOKIE_ARG=`grep '^\-setcookie' $VMARGS_PATH` -if [ -z "$COOKIE_ARG" ]; then - echo "vm.args needs to have a -setcookie parameter." - exit 1 -fi - -# Make sure CWD is set to the right dir -cd $USE_DIR - -# Make sure log directory exists -mkdir -p $USE_DIR/log - -# Add ERTS bin dir to our path -ERTS_PATH=$RUNNER_BASE_DIR/erts-$ERTS_VSN/bin - -# Setup command to control the node -NODETOOL="$ERTS_PATH/escript $ERTS_PATH/nodetool $NAME_ARG $COOKIE_ARG" - -# Setup remote shell command to control node -REMSH="$ERTS_PATH/erl $REMSH_NAME_ARG $REMSH_REMSH_ARG $COOKIE_ARG" - -# Common functions - -# Ping node without allowing nodetool to take stdin -ping_node() { - $NODETOOL ping < /dev/null -} - -# Set the PID global variable, return 1 on error -get_pid() { - PID=`$NODETOOL getpid < /dev/null` - ES=$? - if [ "$ES" -ne 0 ]; then - echo "Node is not running!" - return 1 - fi - - # don't allow empty or init pid's - if [ -z $PID ] || [ "$PID" -le 1 ]; then - return 1 - fi - - return 0 -} - -# Check the first argument for instructions -case "$1" in - start|start_boot) - # Make sure there is not already a node running - RES=`ping_node` - if [ "$RES" = "pong" ]; then - echo "Node is already running!" - exit 1 - fi - case "$1" in - start) - shift - START_OPTION="console" - HEART_OPTION="start" - ;; - start_boot) - shift - START_OPTION="console_boot" - HEART_OPTION="start_boot" - ;; - esac - RUN_PARAM=$(printf "\'%s\' " "$@") - HEART_COMMAND="$RUNNER_BASE_DIR/bin/$SCRIPT $HEART_OPTION $RUN_PARAM" - export HEART_COMMAND - mkdir -p $PIPE_DIR - $ERTS_PATH/run_erl -daemon $PIPE_DIR $RUNNER_LOG_DIR "exec $RUNNER_BASE_DIR/bin/$SCRIPT $START_OPTION $RUN_PARAM" 2>&1 - ;; - - stop) - # Wait for the node to completely stop... - case `uname -s` in - Darwin) - # Make sure we explicitly set this because iTerm.app doesn't for - # some reason. - COMMAND_MODE=unix2003 - esac - - # Get the PID from nodetool - get_pid - GPR=$? - if [ "$GPR" -ne 0 ] || [ -z $PID ]; then - exit $GPR - fi - - # Tell nodetool to initiate a stop - $NODETOOL stop - ES=$? - if [ "$ES" -ne 0 ]; then - exit $ES - fi - - # Wait for the node to completely stop... - while `kill -s 0 $PID 2>/dev/null` - do - sleep 1 - done - ;; - - restart) - ## Restart the VM without exiting the process - $NODETOOL restart - ES=$? - if [ "$ES" -ne 0 ]; then - exit $ES - fi - ;; - - reboot) - ## Restart the VM completely (uses heart to restart it) - $NODETOOL reboot - ES=$? - if [ "$ES" -ne 0 ]; then - exit $ES - fi - ;; - - ping) - ## See if the VM is alive - ping_node - ES=$? - if [ "$ES" -ne 0 ]; then - exit $ES - fi - ;; - - attach) - # Make sure a node is running - ping_node - ES=$? - if [ "$ES" -ne 0 ]; then - echo "Node is not running!" - exit $ES - fi - - shift - exec $ERTS_PATH/to_erl $PIPE_DIR - ;; - - remote_console) - # Make sure a node is running - ping_node - ES=$? - if [ "$ES" -ne 0 ]; then - echo "Node is not running!" - exit $ES - fi - - shift - exec $REMSH - ;; - - upgrade) - if [ -z "$2" ]; then - echo "Missing upgrade package argument" - echo "Usage: $SCRIPT upgrade {package base name}" - echo "NOTE {package base name} MUST NOT include the .tar.gz suffix" - exit 1 - fi - - # Make sure a node IS running - ping_node - ES=$? - if [ "$ES" -ne 0 ]; then - echo "Node is not running!" - exit $ES - fi - - node_name=`echo $NAME_ARG | awk '{print $2}'` - erlang_cookie=`echo $COOKIE_ARG | awk '{print $2}'` - - $ERTS_PATH/escript $RUNNER_BASE_DIR/bin/install_upgrade.escript $node_name $erlang_cookie $2 - ;; - - console|console_clean|console_boot) - # .boot file typically just $SCRIPT (ie, the app name) - # however, for debugging, sometimes start_clean.boot is useful. - # For e.g. 'setup', one may even want to name another boot script. - case "$1" in - console) BOOTFILE=$SCRIPT ;; - console_clean) BOOTFILE=start_clean ;; - console_boot) - shift - BOOTFILE="$1" - shift - ;; - esac - # Setup beam-required vars - ROOTDIR=$RUNNER_BASE_DIR - BINDIR=$ROOTDIR/erts-$ERTS_VSN/bin - EMU=beam - PROGNAME=`echo $0 | sed 's/.*\\///'` - CMD="$BINDIR/erlexec -boot $RUNNER_BASE_DIR/releases/$APP_VSN/$BOOTFILE -mode embedded -config $CONFIG_PATH -args_file $VMARGS_PATH" - export EMU - export ROOTDIR - export BINDIR - export PROGNAME - - # Dump environment info for logging purposes - echo "Exec: $CMD" -- ${1+"$@"} - echo "Root: $ROOTDIR" - - # Log the startup - logger -t "$SCRIPT[$$]" "Starting up" - - # Start the VM - exec $CMD -- ${1+"$@"} - ;; - - foreground) - # start up the release in the foreground for use by runit - # or other supervision services - - BOOTFILE=$SCRIPT - FOREGROUNDOPTIONS="-noinput +Bd" - - # Setup beam-required vars - ROOTDIR=$RUNNER_BASE_DIR - BINDIR=$ROOTDIR/erts-$ERTS_VSN/bin - EMU=beam - PROGNAME=`echo $0 | sed 's/.*\///'` - CMD="$BINDIR/erlexec $FOREGROUNDOPTIONS -boot $RUNNER_BASE_DIR/releases/$APP_VSN/$BOOTFILE -config $CONFIG_PATH -args_file $VMARGS_PATH" - export EMU - export ROOTDIR - export BINDIR - export PROGNAME - - # Dump environment info for logging purposes - echo "Exec: $CMD" -- ${1+"$@"} - echo "Root: $ROOTDIR" - - # Start the VM - exec $CMD -- ${1+"$@"} - ;; - getpid) - # Get the PID from nodetool - get_pid - ES=$? - if [ "$ES" -ne 0 ] || [ -z $PID ]; then - exit $ES - fi - echo $PID - ;; - *) - echo "Usage: $SCRIPT {start|start_boot |foreground|stop|restart|reboot|ping|console|getpid|console_clean|console_boot |attach|remote_console|upgrade}" - exit 1 - ;; -esac - -exit 0 diff --git a/test/upgrade_project/rel/files/erl b/test/upgrade_project/rel/files/erl deleted file mode 100755 index f4c63af..0000000 --- a/test/upgrade_project/rel/files/erl +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh - -# /bin/sh on Solaris is not a POSIX compatible shell, but /usr/bin/ksh is. -if [ `uname -s` = 'SunOS' -a "${POSIX_SHELL}" != "true" ]; then - POSIX_SHELL="true" - export POSIX_SHELL - exec /usr/bin/ksh $0 "$@" -fi - -# clear it so if we invoke other scripts, they run as ksh as well -unset POSIX_SHELL - -## This script replaces the default "erl" in erts-VSN/bin. This is -## necessary as escript depends on erl and in turn, erl depends on -## having access to a bootscript (start.boot). Note that this script -## is ONLY invoked as a side-effect of running escript -- the embedded -## node bypasses erl and uses erlexec directly (as it should). -## -## Note that this script makes the assumption that there is a -## start_clean.boot file available in $ROOTDIR/release/VSN. - -# Determine the abspath of where this script is executing from. -ERTS_BIN_DIR=$(cd ${0%/*} && pwd -P) - -# Now determine the root directory -- this script runs from erts-VSN/bin, -# so we simply need to strip off two dirs from the end of the ERTS_BIN_DIR -# path. -ROOTDIR=${ERTS_BIN_DIR%/*/*} - -# Parse out release and erts info -START_ERL=`cat $ROOTDIR/releases/start_erl.data` -ERTS_VSN=${START_ERL% *} -APP_VSN=${START_ERL#* } - -BINDIR=$ROOTDIR/erts-$ERTS_VSN/bin -EMU=beam -PROGNAME=`echo $0 | sed 's/.*\\///'` -CMD="$BINDIR/erlexec" -export EMU -export ROOTDIR -export BINDIR -export PROGNAME - -exec $CMD -boot $ROOTDIR/releases/$APP_VSN/start_clean ${1+"$@"} diff --git a/test/upgrade_project/rel/files/nodetool b/test/upgrade_project/rel/files/nodetool deleted file mode 100644 index ce06c6a..0000000 --- a/test/upgrade_project/rel/files/nodetool +++ /dev/null @@ -1,182 +0,0 @@ -#!/usr/bin/env escript -%% -*- mode: erlang;erlang-indent-level: 4;indent-tabs-mode: nil -*- -%% ex: ft=erlang ts=4 sw=4 et -%% ------------------------------------------------------------------- -%% -%% nodetool: Helper Script for interacting with live nodes -%% -%% ------------------------------------------------------------------- -main(Args) -> - ok = start_epmd(), - %% Extract the args - {RestArgs, TargetNode} = process_args(Args, [], undefined), - - %% any commands that don't need a running node - case RestArgs of - ["chkconfig", File] -> - case file:consult(File) of - {ok, _} -> - io:format("ok\n"), - halt(0); - {error, {Line, Mod, Term}} -> - io:format(standard_error, ["Error on line ", - file:format_error({Line, Mod, Term}), "\n"], []), - halt(1); - {error, R} -> - io:format(standard_error, ["Error reading config file: ", - file:format_error(R), "\n"], []), - halt(1) - end; - _ -> - ok - end, - - %% See if the node is currently running -- if it's not, we'll bail - case {net_kernel:hidden_connect_node(TargetNode), - net_adm:ping(TargetNode)} of - {true, pong} -> - ok; - {false,pong} -> - io:format("Failed to connect to node ~p .\n", [TargetNode]), - halt(1); - {_, pang} -> - io:format("Node ~p not responding to pings.\n", [TargetNode]), - halt(1) - end, - - case RestArgs of - ["getpid"] -> - io:format("~p\n", - [list_to_integer(rpc:call(TargetNode, os, getpid, []))]); - ["ping"] -> - %% If we got this far, the node already responsed to a - %% ping, so just dump a "pong" - io:format("pong\n"); - ["stop"] -> - io:format("~p\n", [rpc:call(TargetNode, init, stop, [], 60000)]); - ["restart"] -> - io:format("~p\n", [rpc:call(TargetNode, init, restart, [], 60000)]); - ["reboot"] -> - io:format("~p\n", [rpc:call(TargetNode, init, reboot, [], 60000)]); - ["rpc", Module, Function | RpcArgs] -> - case rpc:call(TargetNode, - list_to_atom(Module), - list_to_atom(Function), - [RpcArgs], 60000) of - ok -> - ok; - {badrpc, Reason} -> - io:format("RPC to ~p failed: ~p\n", [TargetNode, Reason]), - halt(1); - _ -> - halt(1) - end; - ["rpc_infinity", Module, Function | RpcArgs] -> - case rpc:call(TargetNode, - list_to_atom(Module), - list_to_atom(Function), - [RpcArgs], infinity) of - ok -> - ok; - {badrpc, Reason} -> - io:format("RPC to ~p failed: ~p\n", [TargetNode, Reason]), - halt(1); - _ -> - halt(1) - end; - ["rpcterms", Module, Function, ArgsAsString] -> - case rpc:call(TargetNode, - list_to_atom(Module), - list_to_atom(Function), - consult(ArgsAsString), 60000) of - {badrpc, Reason} -> - io:format("RPC to ~p failed: ~p\n", [TargetNode, Reason]), - halt(1); - Other -> - io:format("~p\n", [Other]) - end; - Other -> - io:format("Other: ~p\n", [Other]), - io:format("Usage: nodetool {chkconfig|getpid|ping|stop|restart|reboot|rpc|rpc_infinity|rpcterms}\n") - end, - net_kernel:stop(). - -process_args([], Acc, TargetNode) -> - {lists:reverse(Acc), TargetNode}; -process_args(["-setcookie", Cookie | Rest], Acc, TargetNode) -> - erlang:set_cookie(node(), list_to_atom(Cookie)), - process_args(Rest, Acc, TargetNode); -process_args(["-name", TargetName | Rest], Acc, _) -> - ThisNode = append_node_suffix(TargetName, "_maint_"), - {ok, _} = net_kernel:start([ThisNode, longnames]), - process_args(Rest, Acc, nodename(TargetName)); -process_args(["-sname", TargetName | Rest], Acc, _) -> - ThisNode = append_node_suffix(TargetName, "_maint_"), - {ok, _} = net_kernel:start([ThisNode, shortnames]), - process_args(Rest, Acc, nodename(TargetName)); -process_args([Arg | Rest], Acc, Opts) -> - process_args(Rest, [Arg | Acc], Opts). - - -start_epmd() -> - [] = os:cmd(epmd_path() ++ " -daemon"), - ok. - -epmd_path() -> - ErtsBinDir = filename:dirname(escript:script_name()), - Name = "epmd", - case os:find_executable(Name, ErtsBinDir) of - false -> - case os:find_executable(Name) of - false -> - io:format("Could not find epmd.~n"), - halt(1); - GlobalEpmd -> - GlobalEpmd - end; - Epmd -> - Epmd - end. - - -nodename(Name) -> - case string:tokens(Name, "@") of - [_Node, _Host] -> - list_to_atom(Name); - [Node] -> - [_, Host] = string:tokens(atom_to_list(node()), "@"), - list_to_atom(lists:concat([Node, "@", Host])) - end. - -append_node_suffix(Name, Suffix) -> - case string:tokens(Name, "@") of - [Node, Host] -> - list_to_atom(lists:concat([Node, Suffix, os:getpid(), "@", Host])); - [Node] -> - list_to_atom(lists:concat([Node, Suffix, os:getpid()])) - end. - - -%% -%% Given a string or binary, parse it into a list of terms, ala file:consult/0 -%% -consult(Str) when is_list(Str) -> - consult([], Str, []); -consult(Bin) when is_binary(Bin)-> - consult([], binary_to_list(Bin), []). - -consult(Cont, Str, Acc) -> - case erl_scan:tokens(Cont, Str, 0) of - {done, Result, Remaining} -> - case Result of - {ok, Tokens, _} -> - {ok, Term} = erl_parse:parse_term(Tokens), - consult([], Remaining, [Term | Acc]); - {eof, _Other} -> - lists:reverse(Acc); - {error, Info, _} -> - {error, Info} - end; - {more, Cont1} -> - consult(Cont1, eof, Acc) - end. diff --git a/test/upgrade_project/rel/files/sys.config b/test/upgrade_project/rel/files/sys.config deleted file mode 100644 index 3b7f6bd..0000000 --- a/test/upgrade_project/rel/files/sys.config +++ /dev/null @@ -1,11 +0,0 @@ -[ - %% SASL config - {sasl, [ - {sasl_error_logger, {file, "log/sasl-error.log"}}, - {errlog_type, error}, - {error_logger_mf_dir, "log/sasl"}, % Log directory - {error_logger_mf_maxbytes, 10485760}, % 10 MB max file size - {error_logger_mf_maxfiles, 5} % 5 files max - ]} -]. - diff --git a/test/upgrade_project/rel/files/vm.args b/test/upgrade_project/rel/files/vm.args deleted file mode 100644 index a9aeb64..0000000 --- a/test/upgrade_project/rel/files/vm.args +++ /dev/null @@ -1,19 +0,0 @@ -## Name of the node --name dummy@127.0.0.1 - -## Cookie for distributed erlang --setcookie dummy - -## Heartbeat management; auto-restarts VM if it dies or becomes unresponsive -## (Disabled by default..use with caution!) -##-heart - -## Enable kernel poll and a few async threads -##+K true -##+A 5 - -## Increase number of concurrent ports/sockets -##-env ERL_MAX_PORTS 4096 - -## Tweak GC to run more often -##-env ERL_FULLSWEEP_AFTER 10 diff --git a/test/upgrade_project/rel/reltool.config b/test/upgrade_project/rel/reltool.config deleted file mode 100644 index b691c77..0000000 --- a/test/upgrade_project/rel/reltool.config +++ /dev/null @@ -1,27 +0,0 @@ -{sys, [ - {lib_dirs, ["../apps"]}, - {rel, "dummy", "0.1", [ - kernel, - stdlib, - sasl, - dummy - ]}, - {rel, "start_clean", "", [kernel, stdlib]}, - {boot_rel, "dummy"}, - {profile, embedded}, - {excl_sys_filters, ["^bin/.*", "^erts.*/bin/(dialyzer|typer)"]}, - {excl_archive_filters, [".*"]}, - - {app, hipe, [{incl_cond, exclude}]}, - - {app, dummy, [{incl_cond, include}]} -]}. - -{overlay, [ - {mkdir, "log/sasl"}, - {copy, "files/erl", "{{erts_vsn}}/bin/erl"}, - {copy, "files/nodetool", "{{erts_vsn}}/bin/nodetool"}, - {copy, "files/dummy", "bin/dummy"}, - {copy, "files/sys.config", "releases/\{\{rel_vsn\}\}/sys.config"}, - {copy, "files/vm.args", "releases/\{\{rel_vsn\}\}/vm.args"} - ]}. -- cgit v1.1