[dev] refactor log.py -> logger.sh (#32)

* update.sh: fetch will prune * log: use hostname directly * refactor log.py to logger.sh (#31) * logger.sh: refactor log.py to bash script * update.sh use beacon; ci test beacon * install.sh: install dep first * install.sh: DFS_UPDATED_RET=85 * more beacon; use stderr * remove py3 dep * install.sh: remove py3 * install.sh: -s|--secure * async log; beacon add sys.login * update use sync beacon * fix ci minor bug; macos: uuidgen/e2fsprogs * logger.sh: not need to use uuid5 * bug fix * dfs err_return * common.sh: post_log and post_beacon will check #args * bug fix * zshrc: fix locale when C.UTF-8 not exists * WIP: combine install -a and tools/ scripts * finish combination; get_os_name; macos.sh * test.ci: now all use -a to install deps * bug fix * bug fix; ci: install.sh run with -x * install.sh: bug fix that re-run install.sh after updated needs orgin args * format Co-authored-by: xiongdian.me <xiongdian.me@bytedance.com>
2026-10-23 05:08:16 +08:00 · 2022-12-03 20:37:20 +08:00
parent 56e2b217eb
commit ff8ac21424
12 changed files with 251 additions and 161 deletions
--- a/tools/alpine.sh
+++ b/tools/alpine.sh
@@ -1,21 +1,23 @@
 #!/bin/bash
-
 set -e
+THIS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd )
+source "$THIS_DIR/common.sh"

 set_mirror()
 {
    MIRROR=${1:-"mirrors.tuna.tsinghua.edu.cn"}
-    MIRROR=${MIRROR//\//\\\/}
-    sed -i "s/dl-cdn.alpinelinux.org/$MIRROR/g" /etc/apk/repositories
+    sed -i "s@dl-cdn.alpinelinux.org@${MIRROR}@g" /etc/apk/repositories
 }

 apk_add()
 {
    apk update
-
-    # mass installation
-    apk add zsh git tmux vim curl wget bash python3 py3-pip htop gcc g++ cmake make fzf perl linux-headers bind-tools iputils man-db coreutils util-linux
-    #for i in {fzf,ripgrep}; do apk add $i -y; done
+    # lite
+    apk add zsh bash git tmux vim curl fzf iputils coreutils util-linux
+    # full
+    if [[ -z "$DFS_LITE" ]]; then
+        apk add wget python3 py3-pip htop gcc g++ cmake make perl linux-headers bind-tools man-db
+    fi
 }

 set_timezone()
--- a/tools/common.sh
+++ b/tools/common.sh
@@ -109,7 +109,7 @@ parse_arg()
    while [[ $# > 0 || -n "$ARG" ]]; do
        if [[ -z "$ARG" ]]; then ARG=$1; shift; fi
        case $ARG in
-            -q*|--quite ) DFS_QUIET=1 ;;
+            -q*|--quite ) export DFS_QUIET=1 ;;
            --* ) PARSE_ARG_RET+=("$ARG") ;;
            -* ) PARSE_ARG_RET+=("${ARG:0:2}") ;;
            *  ) PARSE_ARG_RET+=("$ARG") ;;
@@ -148,10 +148,32 @@ ask_for_Yn()

 post_log()
 {
-    python3 "${DOTFILES}/tools/log.py" "[$1] $2: $3"
+    if [[ $# != 3 || -z "$1" || -z "$2" || -z "$3" ]]; then
+        fmt_fatal "usage: post_log <level> <section> <content>"
+    fi
+    "${DOTFILES}/tools/logger.sh" "log" "[$1][$2] $3"
 }

-get_os_type() {
+apost_log()
+{
+    post_log "$@" 1>/dev/null &
+}
+
+post_beacon()
+{
+    if [[ $# != 1 || -z "$1" ]]; then
+        fmt_fatal "usage: post_beacon <beacon>"
+    fi
+    "${DOTFILES}/tools/logger.sh" "beacon" "$1"
+}
+
+apost_beacon()
+{
+    post_beacon "$@" 1>/dev/null &
+}
+
+get_os_type()
+{
    local ans="unknown"
    case "$(uname -s)" in
        Darwin*)    ans="MacOS";;
@@ -163,7 +185,8 @@ get_os_type() {
    echo $ans | tr '[:upper:]' '[:lower:]'
 }

-get_linux_dist() {
+get_linux_dist()
+{
    local ans="unknown"
    if [ -f /etc/os-release ]; then
        . /etc/os-release
@@ -185,6 +208,15 @@ get_linux_dist() {
    echo $ans | tr '[:upper:]' '[:lower:]'
 }

+get_os_name()
+{
+    local ans=$(get_os_type)
+    if [[ "$ans" == "linux" ]]; then
+        ans=$(get_linux_dist)
+    fi
+    echo $ans
+}
+
 # if bash-ed, else source-d
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
    $1 "${@:2}"
--- a/tools/log.py
+++ b/tools/log.py
@@ -1,73 +0,0 @@
-#!/usr/bin/env python3
-import os, uuid, socket, argparse, logging
-
-namespace = uuid.UUID("cc23b903-1993-44eb-9c90-48bd841eeac3")
-logging.basicConfig(level=logging.INFO, format="[%(filename)s:%(lineno)d][%(levelname)s] %(message)s")
-
-try:
-    import requests
-except ImportError:
-    logging.critical("Please install requests module")
-    exit(1)
-
-
-def get_uuid_raw() -> str:
-    possible_uuid_files = [
-        "/var/lib/dbus/machine-id",
-        "/etc/machine-id",
-        os.path.join(os.path.expanduser('~'), ".config/dotfiles/uuid"),
-    ]
-    for i in possible_uuid_files:
-        if os.path.exists(i):
-            with open(i, "r") as f:
-                return f.read().strip()
-    if not os.path.exists(os.path.dirname(possible_uuid_files[-1])):
-        os.makedirs(os.path.dirname(possible_uuid_files[-1]))
-    with open(possible_uuid_files[-1], 'w') as f:
-        ans = str(uuid.uuid4())
-        f.write(ans)
-        return ans
-
-
-def get_uuid() -> str:
-    return str(uuid.uuid5(namespace, get_uuid_raw()))
-
-
-def get_hostname() -> str:
-    ans = socket.gethostname()
-    if '-' not in ans:
-        ans += "-ibd-ink"
-    return ans
-
-
-def post_log(url:str, hostname:str, uuid:str, content:str):
-    ans = requests.post(url, params={"hostname": hostname, "uuid": uuid}, data=content)
-    return ans
-
-
-if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description="post log to server")
-    parser.add_argument("-u", "--url", help="url to post to", default="https://api.beardic.cn/post-log")
-    parser.add_argument("content")
-    args = parser.parse_args()
-    url = args.url
-    content = args.content
-    hostname = get_hostname()
-    uuid = get_uuid()
-    content=content.strip()
-    if not content:
-        logging.error("empty log content")
-        exit(0)
-    resp = post_log(url, hostname, uuid, content)
-    if resp.status_code == 200:
-        logging.info("200 ok")
-        exit(0)
-    elif resp.status_code == 403:
-        logging.warning("403 forbidden")
-        logging.info("you may need to register your hostname and uuid")
-        logging.info(f"hostname: {hostname}, uuid: {uuid}")
-        exit(0)
-    else:
-        logging.critical("unknown error")
-        logging.error(f"{resp.status_code}: {resp.text}")
-        exit(1)
--- a/tools/logger.sh
+++ b/tools/logger.sh
@@ -0,0 +1,100 @@
+#!/bin/bash
+
+set -e
+THIS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd )
+source "$THIS_DIR/common.sh"
+
+if [[ -x $(command -v hostname) ]]; then
+    hostname=$(hostname)
+elif [[ -x $(command -v uname) ]]; then
+    hostname=$(uname -n)
+elif [[ -x $(command -v hostnamectl) ]]; then
+    hostname=$(hostnamectl --static)
+elif [[ -n "$HOSTNAME" ]]; then
+    hostname=$HOSTNAME
+elif [[ -f /proc/sys/kernel/hostname ]]; then
+    hostname=$(cat /proc/sys/kernel/hostname)
+elif [[ -f /etc/hostname ]]; then
+    hostname=$(cat /etc/hostname)
+else
+    fmt_fatal "unable to get hostname"
+fi
+
+init_uuid()
+{
+    if  [[ -f ~/.config/dotfiles/uuid ]]; then
+        uuid=$(cat ~/.config/dotfiles/uuid)
+    else
+        if [[ -x $(command -v uuidgen) ]]; then
+            uuid=$(uuidgen)
+        elif [[ -f /proc/sys/kernel/random/uuid ]]; then
+            uuid=$(cat /proc/sys/kernel/random/uuid)
+        else
+            fmt_fatal "unable to generate uuid"
+        fi
+        mkdir -p ~/.config/dotfiles
+        echo "$uuid" > ~/.config/dotfiles/uuid
+    fi
+}
+
+post_beacon()
+{
+    local beacon_type=$1
+    if [[ -z "$beacon_type" ]]; then
+        fmt_fatal "beacon type is required"
+    fi
+    resp=$(curl -sSL -X POST "https://api.beardic.cn/post-beacon?hostname=$hostname&beacon=$beacon_type")
+    if grep -q "200" <<< "$resp"; then
+        echo $resp
+    else
+        echo $resp >&2
+        fmt_fatal "error posting beacon"
+    fi
+}
+
+post_log()
+{
+    local log_content=$1
+    if [[ -z "$log_content" ]]; then
+        fmt_fatal "log content is required"
+    fi
+    init_uuid
+    resp=$(curl -sSL -X POST -H "Content-Type: text/plain" -d "$1" "https://api.beardic.cn/post-log?hostname=$hostname&uuid=$uuid")
+    if grep -q "200" <<< "$resp"; then
+        echo $resp
+    elif grep -q "403" <<< "$resp"; then
+        echo $resp >&2
+        fmt_error "error posting log: authentification failed"
+        fmt_info "try to register you hostname and uuid"
+        fmt_info "hostname: $hostname"
+        fmt_info "uuid: $uuid"
+    else
+        echo $resp >&2
+        fmt_fatal "error posting log"
+    fi
+}
+
+print_help()
+{
+    fmt_info "usage: $0 <beacon|log> <beacon_type|log_content>"
+}
+
+if [[ $# != 2 ]]; then
+    print_help >&2
+    exit 1
+fi
+
+case "$1" in
+    -h|--help)
+        fmt_info "usage: $0 <beacon|log> <beacon_type|log_content>"
+        ;;
+    beacon)
+        post_beacon "$2"
+        ;;
+    log)
+        post_log "$2"
+        ;;
+    *)
+        fmt_fatal "invalid argument"
+        ;;
+esac
--- a/tools/macos.sh
+++ b/tools/macos.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+set -e
+THIS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd )
+source "$THIS_DIR/common.sh"
+
+brew_install()
+{
+    brew update
+    brew install git zsh curl tmux vim util-linux
+}
+
+router()
+{
+    case $1 in
+        brew-install ) brew_install ;;
+        *            ) echo unknown command "$1". available: brew-install;;
+    esac
+}
+
+router $@
--- a/tools/msys2.sh
+++ b/tools/msys2.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
-
 set -e
+THIS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd )
+source "$THIS_DIR/common.sh"

 set_mirror()
 {
@@ -13,7 +14,12 @@ set_mirror()
 pacman_S()
 {
    pacman -Syu
-    pacman -S tmux git zsh curl vim wget base-devel mingw-w64-x86_64-toolchain make cmake gcc zip unzip python3 python3-pip man-pages-posix
+    # lite
+    pacman -S tmux git zsh bash curl vim
+    # full
+    if [[ -z "$DFS_LITE" ]]; then
+        pacman -S wget base-devel mingw-w64-x86_64-toolchain make cmake gcc zip unzip python3 python3-pip man-pages-posix
+    fi
 }

 router()
--- a/tools/test.zsh
+++ b/tools/test.zsh
@@ -17,6 +17,7 @@ grep -q ".zshrc2" ~/.zshrc
 # check scripts and functions
 dfs version
 dfs log 1
+dfs beacon gh.ci
 z ~
 test ~ -ef "$(pwd)"
 dogo
--- a/tools/ubuntu.sh
+++ b/tools/ubuntu.sh
@@ -1,24 +1,25 @@
 #!/bin/bash
-
 set -e
+THIS_DIR=$( cd "$( dirname "${BASH_SOURCE[0]:-${(%):-%x}}" )" && pwd )
+source "$THIS_DIR/common.sh"

 set_mirror()
 {
    MIRROR=${1:-"mirrors.tuna.tsinghua.edu.cn"}
-    MIRROR=${MIRROR//\//\\\/}
    sed -i "s@http://.*archive.ubuntu.com@https://${MIRROR}@g" /etc/apt/sources.list
    sed -i "s@http://.*security.ubuntu.com@https://${MIRROR}@g" /etc/apt/sources.list
 }

 apt_install()
 {
-    # basic packages
-    apt-get update
-    for i in {man-db,vim,ca-certificates}; do apt-get install $i -y; done
-
-    # mass installation
-    apt-get install git tmux zsh curl wget dialog net-tools dnsutils netcat traceroute sudo python3 python3-pip cron inetutils-ping openssh-client openssh-server htop gcc g++ cmake make zip less bsdmainutils
-    for i in {fzf,ripgrep}; do apt-get install $i -y; done
+    apt-get update -y
+    # lite
+    apt-get install -y git zsh bash tmux vim curl inetutils-ping less bsdmainutils
+    # full
+    if [[ -z "$DFS_LITE" ]]; then
+        apt-get install wget dialog net-tools dnsutils netcat traceroute sudo python3 python3-pip cron openssh-client openssh-server htop gcc g++ cmake make zip
+        for i in {fzf,ripgrep,man-db}; do apt-get install -y $i; done
+    fi
 }

 set_timezone()