From 2ef9029bf0a362726ca3316c3e884a4fe60bbbf4 Mon Sep 17 00:00:00 2001
From: Naoki Kosaka <naoki_kosaka@yukimochi.jp>
Date: Sat, 19 Jun 2021 07:30:32 +0900
Subject: [PATCH] Fix some errors, trivial problems.

---
 .github/workflows/build.yml |  1 +
 models/config.go            | 16 +++++++++-------
 models/utils.go             |  4 ++++
 readme.md                   |  4 ++--
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c79aed7..3fc1eea 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,6 +12,7 @@ jobs:
       - uses: actions/checkout@master
       - name: Build Docker Images
         run: |
+          git fetch --prune --unshallow
           docker build -t activity-relay:$(echo ${GITHUB_SHA}|head -c7) .
       - name: Push Docker Images to DockerHub
         run: |
diff --git a/models/config.go b/models/config.go
index 22ca856..f593437 100644
--- a/models/config.go
+++ b/models/config.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"net/url"
 	"os"
+	"strconv"
 
 	"github.com/RichardKnop/machinery/v1"
 	"github.com/RichardKnop/machinery/v1/config"
@@ -36,13 +37,13 @@ func NewRelayConfig() (*RelayConfig, error) {
 
 	iconURL, err := url.ParseRequestURI(viper.GetString("RELAY_ICON"))
 	if err != nil {
-		fmt.Fprintln(os.Stderr, "RELAY_ICON IS INVALID OR EMPTY. THIS COLUMN IS DISABLED.")
+		fmt.Fprintln(os.Stderr, "RELAY_ICON: INVALID OR EMPTY. THIS COLUMN IS DISABLED.")
 		iconURL = nil
 	}
 
 	imageURL, err := url.ParseRequestURI(viper.GetString("RELAY_IMAGE"))
 	if err != nil {
-		fmt.Fprintln(os.Stderr, "RELAY_IMAGE IS INVALID OR EMPTY. THIS COLUMN IS DISABLED.")
+		fmt.Fprintln(os.Stderr, "RELAY_IMAGE: INVALID OR EMPTY. THIS COLUMN IS DISABLED.")
 		imageURL = nil
 	}
 
@@ -117,11 +118,12 @@ func (relayConfig *RelayConfig) RedisClient() *redis.Client {
 func (relayConfig *RelayConfig) DumpWelcomeMessage(moduleName string, version string) string {
 	return fmt.Sprintf(`Welcome to YUKIMOCHI Activity-Relay %s - %s
  - Configuration
-RELAY NAME   : %s
-RELAY DOMAIN : %s
-REDIS URL    : %s
-BIND ADDRESS : %s
-`, version, moduleName, relayConfig.serviceName, relayConfig.domain.Host, relayConfig.redisURL, relayConfig.serverBind)
+RELAY NAME      : %s
+RELAY DOMAIN    : %s
+REDIS URL       : %s
+BIND ADDRESS    : %s
+JOB_CONCURRENCY : %s
+`, version, moduleName, relayConfig.serviceName, relayConfig.domain.Host, relayConfig.redisURL, relayConfig.serverBind, strconv.Itoa(relayConfig.jobConcurrency))
 }
 
 // NewMachineryServer create Redis backed Machinery Server from RelayConfig.
diff --git a/models/utils.go b/models/utils.go
index 6447255..b2dd069 100644
--- a/models/utils.go
+++ b/models/utils.go
@@ -4,6 +4,7 @@ import (
 	"crypto/rsa"
 	"crypto/x509"
 	"encoding/pem"
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -52,6 +53,9 @@ func readPrivateKeyRSA(keyPath string) (*rsa.PrivateKey, error) {
 		return nil, err
 	}
 	decoded, _ := pem.Decode(file)
+	if decoded == nil {
+		return nil, errors.New("ACTOR_PEM IS INVALID. FAILED TO READ")
+	}
 	privateKey, err := x509.ParsePKCS1PrivateKey(decoded.Bytes)
 	if err != nil {
 		return nil, err
diff --git a/readme.md b/readme.md
index cd52cc4..dc52f01 100644
--- a/readme.md
+++ b/readme.md
@@ -13,8 +13,8 @@
  - `github.com/yukimochi/Activity-Relay`
  - `github.com/yukimochi/Activity-Relay/api`
  - `github.com/yukimochi/Activity-Relay/deliver`
- - `github.com/yukimochi/Activity-Relay/worker`
- - `github.com/yukimochi/Activity-Relay/cli`
+ - `github.com/yukimochi/Activity-Relay/control`
+ - `github.com/yukimochi/Activity-Relay/models`
 
 ## Requirements