fine tune

Author: wxiaoguang

services/actions/init.go

@@ -45,8 +45,10 @@ func initGlobalRunnerToken(ctx context.Context) error {
 	if err != nil && !errors.Is(err, util.ErrNotExist) {
 		return fmt.Errorf("unable to check existing token: %w", err)
 	}
-	if existing != nil && !existing.IsActive {
-		log.Warn("The token defined by GITEA_RUNNER_REGISTRATION_TOKEN is already invalidated, please use the latest one from web UI")
+	if existing != nil {
+		if !existing.IsActive {
+			log.Warn("The token defined by GITEA_RUNNER_REGISTRATION_TOKEN is already invalidated, please use the latest one from web UI")
+		}
 		return nil
 	}
 	_, err = actions_model.NewRunnerTokenWithValue(ctx, 0, 0, token)

services/actions/init_test.go

@@ -45,6 +45,13 @@ func TestInitToken(t *testing.T) {
 		require.NoError(t, err)
 		token := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunnerToken{Token: tokenValue})
 		assert.True(t, token.IsActive)
+
+		// init with the same token again, should not create a new token
+		err = initGlobalRunnerToken(db.DefaultContext)
+		require.NoError(t, err)
+		token2 := unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRunnerToken{Token: tokenValue})
+		assert.Equal(t, token.ID, token2.ID)
+		assert.True(t, token.IsActive)
 	})
 
 	t.Run("EnvFileToken", func(t *testing.T) {