Signed-off-by: Wu Fengguang <wfg(a)mail.ustc.edu.cn>
---
doc/mail-robot.md | 6 +++---
doc/manual/apply-account.md | 4 ++--
sbin/build-my-info.rb | 6 +++---
sbin/es-accounts-mapping.sh | 2 +-
src/delimiter/utils.rb | 4 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/doc/mail-robot.md b/doc/mail-robot.md
index 06e4e87..d3778e7 100644
--- a/doc/mail-robot.md
+++ b/doc/mail-robot.md
@@ -58,14 +58,14 @@ attahcment
first attachment
- apply_my_account
- my_uuid
+ my_token
generate uuid
apply_account
invoke ApplyJumperAccount to apply new account with my_info and pub_key
my_info:
- - my_email
- my_name
- - my_uuid
+ - my_email
+ - my_token
apply_jumper_account
required data: pub_key
complete my_info
diff --git a/doc/manual/apply-account.md b/doc/manual/apply-account.md
index d9a03c8..7e1a6a6 100644
--- a/doc/manual/apply-account.md
+++ b/doc/manual/apply-account.md
@@ -23,9 +23,9 @@ Email template:
Which contains account information for you:
- my_email
my_name
- my_uuid
+ my_email
+ my_token
## step 3: one-time setup
diff --git a/sbin/build-my-info.rb b/sbin/build-my-info.rb
index 73f7390..d75f767 100755
--- a/sbin/build-my-info.rb
+++ b/sbin/build-my-info.rb
@@ -12,12 +12,12 @@ print 'email: '
my_email = $stdin.echo = gets.chomp
print 'name: '
my_name = $stdin.echo = gets.chomp
-my_uuid = %x(uuidgen).chomp
+my_token = %x(uuidgen).chomp
my_info = {
- 'my_email' => my_email,
'my_name' => my_name,
- 'my_uuid' => my_uuid
+ 'my_email' => my_email,
+ 'my_token' => my_token
}
def store_account_info(my_info)
diff --git a/sbin/es-accounts-mapping.sh b/sbin/es-accounts-mapping.sh
index d5566dc..d04b0f3 100755
--- a/sbin/es-accounts-mapping.sh
+++ b/sbin/es-accounts-mapping.sh
@@ -18,7 +18,7 @@ else
"my_commit_url": {
"type": "keyword"
},
- "my_uuid": {
+ "my_token": {
"type": "keyword"
},
"my_email": {
diff --git a/src/delimiter/utils.rb b/src/delimiter/utils.rb
index e87bbbe..41803f3 100644
--- a/src/delimiter/utils.rb
+++ b/src/delimiter/utils.rb
@@ -101,9 +101,9 @@ module Utils
raise "query #{DELIMITER_ACCONUT} account info failed!" unless account_info
job['suite'] = 'bisect'
- job['my_uuid'] = account_info['my_uuid']
job['my_name'] = account_info['my_name']
job['my_email'] = account_info['my_email']
+ job['my_token'] = account_info['my_token']
job['bad_job_id'] = job_id
job.delete('error_ids')
@@ -127,7 +127,7 @@ module Utils
def create_bisect_log(git_dir)
FileUtils.mkdir_p TMP_RESULT_ROOT unless File.exist? TMP_RESULT_ROOT
- log_file = File.join(TMP_RESULT_ROOT, "bisect.log")
+ log_file = File.join(TMP_RESULT_ROOT, 'bisect.log')
log_content = parse_bisect_log(git_dir)
File.open(log_file, 'w') do |f|
log_content.each { |line| f.puts(line) }
--
2.23.0