diff --git a/tasks/twitch/twitch_task1/task_twitch.go b/tasks/twitch/twitch_task1/task_twitch.go index 57e8618..c0ab21a 100644 --- a/tasks/twitch/twitch_task1/task_twitch.go +++ b/tasks/twitch/twitch_task1/task_twitch.go @@ -117,10 +117,4 @@ func Execute() { ps.Wait(time.Minute * 5) } - func merge(nums1 []int, m int, nums2 []int, n int) { - for i := 0 ; i < n ; i++ { - nums1[m+i] = n[i] - } - sort - } } diff --git a/utils.go b/utils.go index aa14bbe..edbd926 100644 --- a/utils.go +++ b/utils.go @@ -109,7 +109,7 @@ func (adriver *AutoCloseDriver) Close() { } // log.Println(string(data)) - killshell := fmt.Sprintf("pkill -P %s", data) + killshell := fmt.Sprintf("pkill -9 -P %s", data) // log.Println(killshell) // pkill -f \"port=%d\" // log.Printf(fmt.Sprintf("kill -9 $(lsof -t -i:%d)", port))